X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=cd0a4f21c5f8a2f551cba1e5a890262b7b3576a6;hp=70e3d165835974479ebad8e08e5460adaa1fbeb2;hb=bae46a81520110e52c5af423ce712b9099fe23dd;hpb=ff588497b3dfc3138c9ce005e9270ed5568c05df

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 70e3d1658..cd0a4f21c 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -6,13 +6,13 @@
  */
 
 #define _LGPL_SOURCE
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <common/compat/errno.h>
 #include <common/common.h>
 #include <common/consumer/consumer.h>
 #include <common/defaults.h>
@@ -42,7 +42,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 	uint64_t key, chan_reg_key;
 	char *pathname = NULL;
 	struct lttcomm_consumer_msg msg;
-	struct ust_registry_channel *chan_reg;
+	struct ust_registry_channel *ust_reg_chan;
 	char shm_path[PATH_MAX] = "";
 	char root_shm_path[PATH_MAX] = "";
 	bool is_local_trace;
@@ -97,7 +97,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 		chan_reg_key = ua_chan->key;
 	}
 
-	if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) {
+	if (ua_chan->attr.type == LTTNG_UST_ABI_CHAN_METADATA) {
 		chan_id = -1U;
 		/*
 		 * Metadata channels shm_path (buffers) are handled within
@@ -105,9 +105,9 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 		 * those buffer files.
 		 */
 	} else {
-		chan_reg = ust_registry_channel_find(registry, chan_reg_key);
-		assert(chan_reg);
-		chan_id = chan_reg->chan_id;
+		ust_reg_chan = ust_registry_channel_find(registry, chan_reg_key);
+		assert(ust_reg_chan);
+		chan_id = ust_reg_chan->chan_id;
 		if (ua_sess->shm_path[0]) {
 			strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
 			shm_path[sizeof(shm_path) - 1] = '\0';
@@ -123,7 +123,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 	}
 
 	switch (ua_chan->attr.output) {
-	case LTTNG_UST_MMAP:
+	case LTTNG_UST_ABI_MMAP:
 	default:
 		output = LTTNG_EVENT_MMAP;
 		break;