X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_events.c;h=687da1f92abf63e47466f7bc640e697fa5029341;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=9909fec39c7ca49a7b9d6f75c1a34ffe09a955a6;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c
index 9909fec39..687da1f92 100644
--- a/src/bin/lttng/commands/disable_events.c
+++ b/src/bin/lttng/commands/disable_events.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"
 
@@ -106,12 +106,12 @@ const char *print_event_type(const enum lttng_event_type ev_type)
  * enabled is 0 or 1
  * success is 0 or 1
  */
-static int mi_print_event(char *event_name, int enabled, int success)
+static int mi_print_event(const char *event_name, int enabled, int success)
 {
 	int ret;
 
-	assert(writer);
-	assert(event_name);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(event_name);
 
 	/* Open event element */
 	ret = mi_lttng_writer_open_element(writer, config_element_event);
@@ -174,7 +174,7 @@ static int disable_events(char *session_name)
 		dom.type = LTTNG_DOMAIN_PYTHON;
 	} else {
 		/* Checked by the caller. */
-		assert(0);
+		abort();
 	}
 
 	channel_name = opt_channel_name;
@@ -226,7 +226,7 @@ static int disable_events(char *session_name)
 			enabled = 0;
 			success = 1;
 			MSG("All %s events of type %s are disabled in channel %s",
-					get_domain_str(dom.type),
+					lttng_domain_type_str(dom.type),
 					print_event_type(opt_event_type),
 					print_channel_name(channel_name));
 		}
@@ -265,7 +265,7 @@ static int disable_events(char *session_name)
 				enabled = 1;
 			} else {
 				MSG("%s %s of type %s disabled in channel %s for session %s",
-						get_domain_str(dom.type),
+						lttng_domain_type_str(dom.type),
 						event_name,
 						print_event_type(opt_event_type),
 						print_channel_name(channel_name),
@@ -368,7 +368,9 @@ int cmd_disable_events(int argc, const char **argv)
 	}
 
 	ret = print_missing_or_multiple_domains(
-		opt_kernel + opt_userspace + opt_jul + opt_log4j + opt_python);
+			opt_kernel + opt_userspace + opt_jul + opt_log4j +
+					opt_python,
+			true);
 	if (ret) {
 		ret = CMD_ERROR;
 		goto end;