X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fconf.c;h=7e6c833449857890fa7c8e8a092eaf97d439a750;hb=96ffaa0c61089296dd5c9dd07810f32f97931fc8;hp=4bcf49e336c18dd79c67d0b4091f608f7d382f89;hpb=6c1c0768320135c6936c371b09731851b508c023;p=lttng-tools.git

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 4bcf49e33..7e6c83344 100644
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/error.h>
+#include <common/common.h>
 #include <common/utils.h>
 
 #include "conf.h"
@@ -144,7 +144,7 @@ void config_destroy(char *path)
 	DBG("Removing %s\n", config_path);
 	ret = remove(config_path);
 	if (ret < 0) {
-		perror("remove config file");
+		PERROR("remove config file");
 	}
 end:
 	free(config_path);
@@ -191,7 +191,7 @@ char *config_read_session_name(char *path)
 #define NAME_MAX_SCANF_IS_A_BROKEN_API	"254"
 #endif
 
-	session_name = malloc(NAME_MAX);
+	session_name = zmalloc(NAME_MAX);
 	if (session_name == NULL) {
 		ERR("Out of memory");
 		goto error;