X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=f35043fa46d52a8d6709ece90028c67b72fdb1b9;hb=def8897149ac794709649d97d72f9b8bc7d71bd8;hp=c054db917a40c4f86bd217255224a060875f116e;hpb=fb83fe64f250bec7416f18891a8264450c61ead3;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index c054db917..f35043fa4 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -278,11 +278,21 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			channels[i].enabled = uchan->enabled;
 			channels[i].attr.tracefile_size = uchan->tracefile_size;
 			channels[i].attr.tracefile_count = uchan->tracefile_count;
+
+			/*
+			 * Map enum lttng_ust_output to enum lttng_event_output.
+			 */
 			switch (uchan->attr.output) {
 			case LTTNG_UST_MMAP:
-			default:
 				channels[i].attr.output = LTTNG_EVENT_MMAP;
 				break;
+			default:
+				/*
+				 * LTTNG_UST_MMAP is the only supported UST
+				 * output mode.
+				 */
+				assert(0);
+				break;
 			}
 
 			ret = get_ust_runtime_stats(session, uchan,
@@ -580,7 +590,7 @@ static int list_lttng_kernel_events(char *channel_name,
 	if (nb_event == 0) {
 		*total_size = 0;
 		*events = NULL;
-		goto syscall;
+		goto end;
 	}
 
 	/* Compute required extended infos size */
@@ -596,7 +606,7 @@ static int list_lttng_kernel_events(char *channel_name,
 		goto error;
 	}
 
-	extended_at = ((uint8_t *) events) +
+	extended_at = ((void *) *events) +
 		nb_event * sizeof(struct lttng_event);
 
 	/* Kernel channels */
@@ -643,19 +653,7 @@ static int list_lttng_kernel_events(char *channel_name,
 			&extended_at);
 	}
 
-syscall:
-	if (syscall_table) {
-		ssize_t new_size;
-
-		new_size = syscall_list_channel(kchan, events, nb_event);
-		if (new_size < 0) {
-			free(events);
-			ret = -new_size;
-			goto error;
-		}
-		nb_event = new_size;
-	}
-
+end:
 	return nb_event;
 
 error: