X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.cpp;h=8636cd101850d5557e489e2671add4ede354e4cc;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=4bb681e09c1a9dca8850242dfc156c98beb8e62e;hpb=48a4000561343808724f7cb5fa8c131877489ccd;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.cpp b/src/bin/lttng/commands/list.cpp
index 4bb681e09..8636cd101 100644
--- a/src/bin/lttng/commands/list.cpp
+++ b/src/bin/lttng/commands/list.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2020 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
@@ -14,13 +14,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <common/mi-lttng.h>
-#include <common/time.h>
-#include <common/tracker.h>
-#include <lttng/domain-internal.h>
+#include <common/mi-lttng.hpp>
+#include <common/time.hpp>
+#include <common/tracker.hpp>
+#include <lttng/domain-internal.hpp>
 #include <lttng/lttng.h>
 
-#include "../command.h"
+#include "../command.hpp"
 
 static int opt_userspace;
 static int opt_kernel;
@@ -91,11 +91,12 @@ static char *get_cmdline_by_pid(pid_t pid)
 	}
 
 	/* Caller must free() *cmdline */
-	cmdline = (char *) zmalloc(PATH_MAX);
+	cmdline = zmalloc<char>(PATH_MAX);
 	if (!cmdline) {
 		PERROR("malloc cmdline");
 		goto end;
 	}
+
 	ret = fread(cmdline, 1, PATH_MAX, fp);
 	if (ret < 0) {
 		PERROR("fread proc list");
@@ -338,13 +339,8 @@ static void print_events(struct lttng_event *event)
 	if (ret) {
 		filter_msg = strdup(" [failed to retrieve filter]");
 	} else if (filter_str) {
-		const char * const filter_fmt = " [filter: '%s']";
-
-		filter_msg = (char *) malloc(strlen(filter_str) +
-				strlen(filter_fmt) + 1);
-		if (filter_msg) {
-			sprintf(filter_msg, filter_fmt,
-					filter_str);
+		if (asprintf(&filter_msg, " [filter: '%s']", filter_str) == -1) {
+			filter_msg = NULL;
 		}
 	}
 
@@ -1151,14 +1147,8 @@ static int list_session_agent_events(void)
 			if (ret) {
 				filter_msg = strdup(" [failed to retrieve filter]");
 			} else if (filter_str) {
-				const char * const filter_fmt =
-						" [filter: '%s']";
-
-				filter_msg = (char *) malloc(strlen(filter_str) +
-						strlen(filter_fmt) + 1);
-				if (filter_msg) {
-					sprintf(filter_msg, filter_fmt,
-							filter_str);
+				if (asprintf(&filter_msg, " [filter: '%s']", filter_str) == -1) {
+					filter_msg = NULL;
 				}
 			}