Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / bin / lttng / commands / remove_trigger.c

diff --git a/src/bin/lttng/commands/remove_trigger.c b/src/bin/lttng/commands/remove_trigger.c
index 3c6e2b3f0d641d2182223614b1e20de526827b16..2ac237c3a872ee7449a065d403f601458f615794 100644 (file)
--- 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) {