Add UST event exist error code

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

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 89a42528cd13ebf87d97923e572e207e729bb2cf..6bb471a9dca0a3cc03b9448ec0b6be649a12e5e8 100644 (file)
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -50,7 +50,7 @@
 #include "event.h"
 #include "futex.h"
 #include "hashtable.h"
-#include "kernel-ctl.h"
+#include "kernel.h"
 #include "lttng-sessiond.h"
 #include "shm.h"
 #include "ust-app.h"
@@ -192,7 +192,7 @@ void setup_consumerd_path(void)
         */
 #if (CAA_BITS_PER_LONG == 32)
        if (!consumerd32_path[0]) {
-               consumerd32_bindir = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
+               consumerd32_path = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
        }
        if (!consumerd32_libdir[0]) {
                consumerd32_libdir = INSTALL_LIB_PATH;
@@ -1575,7 +1575,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
                }
                case LTTNG_CONSUMER32_UST:
                {
-                       char *tmpnew;
+                       char *tmpnew = NULL;
 
                        if (consumerd32_libdir[0] != '\0') {
                                char *tmp;