Cleanup: Replace all perror() uses by the PERROR macro

[lttng-tools.git] / src / bin / lttng / conf.c

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 4bcf49e336c18dd79c67d0b4091f608f7d382f89..7e6c833449857890fa7c8e8a092eaf97d439a750 100644 (file)
--- 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;