X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=32aff65d35f7c07dd2ad60982b266c2f8c72c259;hb=702f26c8641ee4554c629d13b9367b1e93f96e31;hp=9e70df107dccd97defadd720881f4b386f3d7796;hpb=57739a6b3247c7ded74522906e214eff0d6dc14c;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 9e70df107..32aff65d3 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -1204,7 +1204,7 @@ struct lttng_condition *handle_condition_event(int *argc, const char ***argv)
 		goto error;
 	}
 
-	c = lttng_condition_on_event_create(res.er);
+	c = lttng_condition_event_rule_matches_create(res.er);
 	lttng_event_rule_destroy(res.er);
 	res.er = NULL;
 	if (!c) {
@@ -1220,7 +1220,7 @@ struct lttng_condition *handle_condition_event(int *argc, const char ***argv)
 
 		assert(expr);
 		assert(*expr);
-		status = lttng_condition_on_event_append_capture_descriptor(
+		status = lttng_condition_event_rule_matches_append_capture_descriptor(
 				c, *expr);
 		if (status != LTTNG_CONDITION_STATUS_OK) {
 			if (status == LTTNG_CONDITION_STATUS_UNSUPPORTED) {
@@ -2012,7 +2012,7 @@ int cmd_add_trigger(int argc, const char **argv)
 	struct lttng_dynamic_pointer_array actions;
 	struct argpar_state *argpar_state = NULL;
 	struct argpar_item *argpar_item = NULL;
-	struct lttng_action *action_group = NULL;
+	struct lttng_action *action_list = NULL;
 	struct lttng_action *action = NULL;
 	struct lttng_trigger *trigger = NULL;
 	char *error = NULL;
@@ -2148,8 +2148,8 @@ int cmd_add_trigger(int argc, const char **argv)
 		goto error;
 	}
 
-	action_group = lttng_action_group_create();
-	if (!action_group) {
+	action_list = lttng_action_list_create();
+	if (!action_list) {
 		goto error;
 	}
 
@@ -2158,20 +2158,20 @@ int cmd_add_trigger(int argc, const char **argv)
 
 		action = lttng_dynamic_pointer_array_steal_pointer(&actions, i);
 
-		status = lttng_action_group_add_action(action_group, action);
+		status = lttng_action_list_add_action(action_list, action);
 		if (status != LTTNG_ACTION_STATUS_OK) {
 			goto error;
 		}
 
 		/*
-		 * The `lttng_action_group_add_action()` takes a reference to
+		 * The `lttng_action_list_add_action()` takes a reference to
 		 * the action. We can destroy ours.
 		 */
 		lttng_action_destroy(action);
 		action = NULL;
 	}
 
-	trigger = lttng_trigger_create(condition, action_group);
+	trigger = lttng_trigger_create(condition, action_list);
 	if (!trigger) {
 		goto error;
 	}
@@ -2222,7 +2222,7 @@ end:
 	argpar_item_destroy(argpar_item);
 	lttng_dynamic_pointer_array_reset(&actions);
 	lttng_condition_destroy(condition);
-	lttng_action_destroy(action_group);
+	lttng_action_destroy(action_list);
 	lttng_action_destroy(action);
 	lttng_trigger_destroy(trigger);
 	free(error);