X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fremove_trigger.c;h=2ac237c3a872ee7449a065d403f601458f615794;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=3c6e2b3f0d641d2182223614b1e20de526827b16;hpb=523c4f8cdeb927b789710e3dafcb3f249751ccfd;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/remove_trigger.c b/src/bin/lttng/commands/remove_trigger.c
index 3c6e2b3f0..2ac237c3a 100644
--- a/src/bin/lttng/commands/remove_trigger.c
+++ b/src/bin/lttng/commands/remove_trigger.c
@@ -170,7 +170,7 @@ int cmd_remove_trigger(int argc, const char **argv)
 	}
 
 	trigger_status = lttng_triggers_get_count(triggers, &triggers_count);
-	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+	LTTNG_ASSERT(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
 	for (i = 0; i < triggers_count; i++) {
 		const struct lttng_trigger *trigger;
@@ -191,7 +191,7 @@ int cmd_remove_trigger(int argc, const char **argv)
 
 		trigger_status = lttng_trigger_get_owner_uid(
 				trigger, &trigger_uid);
-		assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+		LTTNG_ASSERT(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
 		if (trigger_uid == uid && strcmp(trigger_name, name) == 0) {
 			trigger_to_remove = trigger;
@@ -227,7 +227,7 @@ error:
 
 end:
 	/* Mi closing. */
-	if (lttng_opt_mi) {
+	if (lttng_opt_mi && mi_writer) {
 		/* Close output element. */
 		int mi_ret = mi_lttng_writer_close_element(mi_writer);
 		if (mi_ret) {