X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_channels.c;h=cf9f20bb6d3fd2a539651c6c08d6a09699ca68c5;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=344be237d26c2d4581c26c50363dbbe7558293ff;hpb=3533d06b152292235b1ab28364804754339e62f5;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/disable_channels.c b/src/bin/lttng/commands/disable_channels.c
index 344be237d..cf9f20bb6 100644
--- a/src/bin/lttng/commands/disable_channels.c
+++ b/src/bin/lttng/commands/disable_channels.c
@@ -13,9 +13,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include <common/mi-lttng.h>
+#include <lttng/domain-internal.h>
 
 #include "../command.h"
 
@@ -54,8 +54,8 @@ static int mi_partial_channel_print(char *channel_name, unsigned int enabled,
 {
 	int ret;
 
-	assert(writer);
-	assert(channel_name);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(channel_name);
 
 	/* Open channel element */
 	ret = mi_lttng_writer_open_element(writer, config_element_channel);
@@ -112,7 +112,7 @@ static int disable_channels(char *session_name)
 		dom.type = LTTNG_DOMAIN_UST;
 	} else {
 		/* Checked by the caller. */
-		assert(0);
+		abort();
 	}
 
 	handle = lttng_create_handle(session_name, &dom);
@@ -155,7 +155,8 @@ static int disable_channels(char *session_name)
 
 		} else {
 			MSG("%s channel %s disabled for session %s",
-					get_domain_str(dom.type), channel_name, session_name);
+					lttng_domain_type_str(dom.type),
+					channel_name, session_name);
 			enabled = 0;
 			success = 1;
 		}