Rename on-event to event-rule-matches

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 3fab5af02e94d7194fca8033755cbb7abfb93f4e..45bf3b78f7fe011d40aa738528b34f79f90a4686 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -34,8 +34,8 @@
 #include <lttng/channel.h>
 #include <lttng/condition/condition-internal.h>
 #include <lttng/condition/condition.h>
-#include <lttng/condition/on-event-internal.h>
-#include <lttng/condition/on-event.h>
+#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/event-rule-matches.h>
 #include <lttng/error-query-internal.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/event-rule.h>
@@ -4315,7 +4315,8 @@ enum lttng_error_code synchronize_tracer_notifier_register(
        assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
        assert(condition);
-       assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_ON_EVENT);
+       assert(lttng_condition_get_type(condition) ==
+                       LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
        trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
        trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
@@ -4497,7 +4498,8 @@ enum lttng_error_code synchronize_tracer_notifier_unregister(
                                        trigger);
 
        assert(condition);
-       assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_ON_EVENT);
+       assert(lttng_condition_get_type(condition) ==
+                       LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
        session_lock_list();
        switch (trigger_domain) {
@@ -4660,7 +4662,7 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 {
        enum lttng_error_code ret_code;
        const struct lttng_trigger *query_target_trigger;
-       struct lttng_action *query_target_action;
+       struct lttng_action *query_target_action = NULL;
        struct lttng_trigger *matching_trigger = NULL;
        const char *trigger_name;
        uid_t trigger_owner;
@@ -4763,6 +4765,7 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
                break;
        }
        default:
+               abort();
                break;
        }