X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=972043eeb25f672c9ec02d9f13232c4ca80d98b1;hb=9550ee81b0277eb873333fc42a9e6ffc2ef00274;hp=d9b8591b3afbdf99a39052356359df0bffd2c18b;hpb=8274eeba326aabc50d60ea86b7c864de66a99c58;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index d9b8591b3..972043eeb 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -721,9 +721,8 @@ static int enable_events(char *session_name)
 		/* Default. */
 		dom.buf_type = LTTNG_BUFFER_PER_UID;
 	} else {
-		print_missing_domain();
-		ret = CMD_ERROR;
-		goto error;
+		/* Checked by the caller. */
+		assert(0);
 	}
 
 	if (opt_exclude) {
@@ -1150,9 +1149,7 @@ static int enable_events(char *session_name)
 			strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
 			ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 		} else {
-			print_missing_domain();
-			ret = CMD_ERROR;
-			goto error;
+			assert(0);
 		}
 
 		if (!opt_filter) {
@@ -1217,7 +1214,7 @@ static int enable_events(char *session_name)
 					 * Don't print the default channel
 					 * name for agent domains.
 					 */
-					MSG("%s event %s%s enabled.",
+					MSG("%s event %s%s enabled",
 						get_domain_str(dom.type),
 						event_name,
 						exclusion_string);
@@ -1431,6 +1428,13 @@ int cmd_enable_events(int argc, const char **argv)
 		}
 	}
 
+	ret = print_missing_or_multiple_domains(
+		opt_kernel + opt_userspace + opt_jul + opt_log4j + opt_python);
+	if (ret) {
+		ret = CMD_ERROR;
+		goto end;
+	}
+
 	/* Mi check */
 	if (lttng_opt_mi) {
 		writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);