X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=49adabb72336b11d0255e3a1f1d2462b0a70601a;hp=74c4b302320de5b49926f1ff497c31b59f4fb9fa;hb=5b0e3ccb033e701a4c4005d6859757652ca8897c;hpb=dba13f1d5dffdd2ecaa14ba8ff88c27805153016

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 74c4b3023..49adabb72 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -145,8 +145,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	}
 
 	/* Prep channel message structure */
-	consumer_init_channel_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_CHANNEL,
+	consumer_init_add_channel_comm_msg(&lkm,
 			channel->key,
 			ksession->id,
 			pathname,
@@ -229,8 +228,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	}
 
 	/* Prep channel message structure */
-	consumer_init_channel_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_CHANNEL,
+	consumer_init_add_channel_comm_msg(&lkm,
 			session->metadata->key,
 			session->id,
 			pathname,
@@ -279,6 +277,7 @@ error:
 /*
  * Sending a single stream to the consumer with command ADD_STREAM.
  */
+static
 int kernel_consumer_add_stream(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel, struct ltt_kernel_stream *stream,
 		struct ltt_kernel_session *session, unsigned int monitor)
@@ -359,7 +358,7 @@ error:
  *
  * The consumer socket lock must be held by the caller.
  */
-int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
+int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
 		unsigned int monitor)
 {
@@ -446,7 +445,7 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
 	/* Send channel and streams of it */
 	cds_list_for_each_entry(chan, &session->channel_list.head, list) {
-		ret = kernel_consumer_send_channel_stream(sock, chan, session,
+		ret = kernel_consumer_send_channel_streams(sock, chan, session,
 				monitor);
 		if (ret < 0) {
 			goto error;