X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.c;h=f0f57ebaa7a3749d5fbb8a8c4357dd2039c777d8;hb=a5a309207b81778262744a9de568f6d7c54996e2;hp=7002b33c7b2969bca7ce97f04b2ffd64ecd394a6;hpb=fb83fe64f250bec7416f18891a8264450c61ead3;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/buffer-registry.c b/src/bin/lttng-sessiond/buffer-registry.c
index 7002b33c7..f0f57ebaa 100644
--- a/src/bin/lttng-sessiond/buffer-registry.c
+++ b/src/bin/lttng-sessiond/buffer-registry.c
@@ -24,7 +24,8 @@
 #include "buffer-registry.h"
 #include "fd-limit.h"
 #include "ust-consumer.h"
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
+#include "lttng-ust-error.h"
 #include "utils.h"
 
 /*
@@ -73,10 +74,10 @@ no_match:
  * Hash function for the per UID registry hash table. This XOR the triplet
  * together.
  */
-static unsigned long ht_hash_reg_uid(void *_key, unsigned long seed)
+static unsigned long ht_hash_reg_uid(const void *_key, unsigned long seed)
 {
 	uint64_t xored_key;
-	struct buffer_reg_uid *key = _key;
+	const struct buffer_reg_uid *key = _key;
 
 	assert(key);
 
@@ -334,8 +335,7 @@ end:
  */
 int buffer_reg_uid_consumer_channel_key(
 		struct cds_list_head *buffer_reg_uid_list,
-		uint64_t usess_id, uint64_t chan_key,
-		uint64_t *consumer_chan_key)
+		uint64_t chan_key, uint64_t *consumer_chan_key)
 {
 	struct lttng_ht_iter iter;
 	struct buffer_reg_uid *uid_reg = NULL;