Rename lttngerr.h to error.h

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

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 8cb264ab1bd74b413a4b0a32b50cf80bfdbb5343..ab83c6a75ab0a7360e9b7eaefa0519002bec1a19 100644 (file)
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -40,10 +40,11 @@
 #include <config.h>
 #include <urcu/compiler.h>
 
-#include <common/lttngerr.h>
+#include <common/defaults.h>
+#include <common/common.h>
+#include <common/kernel-consumer/kernel-consumer.h>
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/sessiond-comm/sessiond-comm.h>
-#include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
 
 #include "lttng-consumerd.h"
@@ -253,15 +254,15 @@ int main(int argc, char **argv)
                switch (opt_type) {
                case LTTNG_CONSUMER_KERNEL:
                        snprintf(command_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH,
-                                       LTTNG_RUNDIR);
+                                       DEFAULT_LTTNG_RUNDIR);
                        break;
                case LTTNG_CONSUMER64_UST:
                        snprintf(command_sock_path, PATH_MAX,
-                                       USTCONSUMERD64_CMD_SOCK_PATH, LTTNG_RUNDIR);
+                                       USTCONSUMERD64_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
                        break;
                case LTTNG_CONSUMER32_UST:
                        snprintf(command_sock_path, PATH_MAX,
-                                       USTCONSUMERD32_CMD_SOCK_PATH, LTTNG_RUNDIR);
+                                       USTCONSUMERD32_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
                        break;
                default:
                        WARN("Unknown consumerd type");
@@ -284,15 +285,15 @@ int main(int argc, char **argv)
                switch (opt_type) {
                case LTTNG_CONSUMER_KERNEL:
                        snprintf(error_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH,
-                                       LTTNG_RUNDIR);
+                                       DEFAULT_LTTNG_RUNDIR);
                        break;
                case LTTNG_CONSUMER64_UST:
                        snprintf(error_sock_path, PATH_MAX,
-                                       USTCONSUMERD64_ERR_SOCK_PATH, LTTNG_RUNDIR);
+                                       USTCONSUMERD64_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
                        break;
                case LTTNG_CONSUMER32_UST:
                        snprintf(error_sock_path, PATH_MAX,
-                                       USTCONSUMERD32_ERR_SOCK_PATH, LTTNG_RUNDIR);
+                                       USTCONSUMERD32_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
                        break;
                default:
                        WARN("Unknown consumerd type");