Rename lttngerr.h to error.h

[lttng-tools.git] / src / bin / lttng-sessiond / main.c

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 82deb9b0e4cc2acff6942ffbfa38aa5d9374ddb8..d7ed4eb0b0a7fc0ec18b99d7fd73a1a8c8b1485e 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -39,11 +39,11 @@
 #include <config.h>
 
 #include <bin/lttng-consumerd/lttng-consumerd.h>
-#include <common/lttngerr.h>
+#include <common/common.h>
+#include <common/compat/poll.h>
+#include <common/defaults.h>
 #include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
-#include <common/runas.h>
-#include <common/compat/poll.h>
 
 #include "lttng-sessiond.h"
 #include "channel.h"
@@ -4169,14 +4169,14 @@ static void sighandler(int sig)
 {
        switch (sig) {
        case SIGPIPE:
-               DBG("SIGPIPE catched");
+               DBG("SIGPIPE caugth");
                return;
        case SIGINT:
-               DBG("SIGINT catched");
+               DBG("SIGINT caugth");
                stop_threads();
                break;
        case SIGTERM:
-               DBG("SIGTERM catched");
+               DBG("SIGTERM caugth");
                stop_threads();
                break;
        default:
@@ -4278,7 +4278,7 @@ int main(int argc, char **argv)
        is_root = !getuid();
 
        if (is_root) {
-               rundir = strdup(LTTNG_RUNDIR);
+               rundir = strdup(DEFAULT_LTTNG_RUNDIR);
 
                /* Create global run dir with root access */
                ret = create_lttng_rundir(rundir);
@@ -4325,7 +4325,7 @@ int main(int argc, char **argv)
                 * Create rundir from home path. This will create something like
                 * $HOME/.lttng
                 */
-               ret = asprintf(&rundir, LTTNG_HOME_RUNDIR, home_path);
+               ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
                if (ret < 0) {
                        ret = -ENOMEM;
                        goto error;