X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fsession.c;h=9fef73cf7ecdce33e10a7599b2a580742ecc3257;hp=bf5f618a8ef34a7c7209806671ab7ed5feafb425;hb=20fe210416ef1cc0e9b85e5a40c58344e3185fd6;hpb=1657e9bb835a28e66396deac871270fe373d5ff4

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index bf5f618a8..9fef73cf7 100644
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -17,12 +17,10 @@
  */
 
 #define _GNU_SOURCE
-#include <lttng/liblttngctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <urcu/list.h>
-#include <uuid/uuid.h>
 
 #include "lttngerr.h"
 #include "session.h"
@@ -115,7 +113,7 @@ struct ltt_session *find_session_by_name(char *name)
 	struct ltt_session *iter;
 
 	cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
-		if (strncmp(iter->name, name, strlen(iter->name)) == 0) {
+		if (strncmp(iter->name, name, strlen(name)) == 0) {
 			found = 1;
 			break;
 		}
@@ -202,11 +200,9 @@ int create_session(char *name, uuid_t *session_id)
 
 	/* Init list */
 	CDS_INIT_LIST_HEAD(&new_session->ust_traces);
-	CDS_INIT_LIST_HEAD(&new_session->kernel_traces);
 
 	/* Set trace list counter */
 	new_session->ust_trace_count = 0;
-	new_session->kern_trace_count = 0;
 
 	/* Add new session to the global session list */
 	add_session_list(new_session);
@@ -226,7 +222,7 @@ error_mem:
  *  Iterate over the global session list and
  *  fill the lttng_session array.
  */
-void get_lttng_session(struct lttng_session *lt)
+void get_lttng_session(struct lttng_session *sessions)
 {
 	int i = 0;
 	struct ltt_session *iter;
@@ -239,10 +235,10 @@ void get_lttng_session(struct lttng_session *lt)
 	 */
 	cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
 		/* Copy name and uuid */
-		uuid_unparse(iter->uuid, lsess.uuid);
+		uuid_copy(lsess.uuid, iter->uuid);
 		strncpy(lsess.name, iter->name, sizeof(lsess.name));
 		lsess.name[sizeof(lsess.name) - 1] = '\0';
-		memcpy(&lt[i], &lsess, sizeof(lsess));
+		memcpy(&sessions[i], &lsess, sizeof(lsess));
 		i++;
 		/* Reset struct for next pass */
 		memset(&lsess, 0, sizeof(lsess));