include: add missing "extern"

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

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index e7809dc521362408cc2df6b3ed58dddc5f55d2a8..c73154b041c3c97314f5539654354b83f9f99320 100644 (file)
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -18,6 +18,7 @@
 #include "common/mi-lttng.h"
 #include "common/string-utils/string-utils.h"
 #include "common/utils.h"
+#include <lttng/domain-internal.h>
 /* For lttng_event_rule_type_str(). */
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/lttng.h>
@@ -831,7 +832,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
        }
 
        if (event_rule_type == LTTNG_EVENT_RULE_TYPE_UNKNOWN) {
-               event_rule_type = LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT;
+               ERR("Event rule requires a --type.");
+               goto error;
        }
 
        /*
@@ -2406,9 +2408,19 @@ int cmd_add_trigger(int argc, const char **argv)
                if (ret_code != LTTNG_OK) {
                        goto error;
                }
+       } else {
+               const char *returned_trigger_name;
+               const enum lttng_trigger_status trigger_status =
+                               lttng_trigger_get_name(trigger,
+                                               &returned_trigger_name);
+
+               if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+                       WARN("Failed to retrieve the added trigger's name.");
+               } else {
+                       MSG("Added trigger `%s`.", returned_trigger_name);
+               }
        }
 
-       MSG("Trigger registered successfully.");
        ret = 0;
 
        goto end;
@@ -2418,7 +2430,7 @@ error:
 
 end:
        /* Mi closing. */
-       if (lttng_opt_mi) {
+       if (lttng_opt_mi && mi_writer) {
                int mi_ret;
 
                /* Close output element. */