X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Fchannel.c;h=2dd9840d4083e864230d87235eb9e01752f4cc68;hb=9730260e7e733b421e1af26a9953f938de2628cc;hp=fda679c78f3ebacfbee3ff9d52b4aabb25228cdc;hpb=322585731ced1adba36cddcb8bdd5d997d1b2e3e;p=lttng-tools.git

diff --git a/lttng-sessiond/channel.c b/lttng-sessiond/channel.c
index fda679c78..2dd9840d4 100644
--- a/lttng-sessiond/channel.c
+++ b/lttng-sessiond/channel.c
@@ -21,13 +21,6 @@
 #include <lttng/lttng.h>
 #include <lttng-sessiond-comm.h>
 #include <lttngerr.h>
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
-#else
-#include "lttng-ust-ctl.h"
-#include "lttng-ust-abi.h"
-#endif
 
 #include "channel.h"
 #include "hashtable.h"
@@ -44,7 +37,7 @@ struct lttng_channel *channel_new_default_attr(int dom)
 
 	chan = zmalloc(sizeof(struct lttng_channel));
 	if (chan == NULL) {
-		perror("malloc channel init");
+		perror("zmalloc channel init");
 		goto error_alloc;
 	}
 
@@ -95,9 +88,9 @@ int channel_ust_copy(struct ltt_ust_channel *dst,
 
 	/*
 	cds_list_for_each_entry(uevent, &src->events.head, list) {
-		new_uevent = malloc(sizeof(struct ltt_ust_event));
+		new_uevent = zmalloc(sizeof(struct ltt_ust_event));
 		if (new_uevent == NULL) {
-			perror("malloc ltt_ust_event");
+			perror("zmalloc ltt_ust_event");
 			goto error;
 		}