X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist_triggers.cpp;h=c9c6c265de053fb66cc3123c338ca6efa42057ac;hb=2460203ad4c64f0dcdb716e833abee10a79ec092;hp=d3961539083eb1cb908cee896a4ec2f4c2b1d1d4;hpb=dc88217e78259cb6b35fbaf6b85ad5aed6a37023;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list_triggers.cpp b/src/bin/lttng/commands/list_triggers.cpp
index d39615390..c9c6c265d 100644
--- a/src/bin/lttng/commands/list_triggers.cpp
+++ b/src/bin/lttng/commands/list_triggers.cpp
@@ -10,14 +10,16 @@
 #include "common/argpar/argpar.h"
 #include "common/dynamic-array.hpp"
 #include "common/mi-lttng.hpp"
+#include "lttng/action/list-internal.hpp"
 
-#include <stdio.h>
 /* For lttng_condition_type_str(). */
 #include "lttng/condition/condition-internal.hpp"
 #include "lttng/condition/event-rule-matches-internal.hpp"
 #include "lttng/condition/event-rule-matches.h"
+
 /* For lttng_domain_type_str(). */
 #include "lttng/domain-internal.hpp"
+
 /* For lttng_event_rule_kernel_syscall_emission_site_str() */
 #include "../loglevel.hpp"
 #include "lttng/event-rule/kernel-syscall-internal.hpp"
@@ -1022,21 +1024,14 @@ static void print_one_trigger(const struct lttng_trigger *trigger)
 	action = lttng_trigger_get_const_action(trigger);
 	action_type = lttng_action_get_type(action);
 	if (action_type == LTTNG_ACTION_TYPE_LIST) {
-		unsigned int count, i;
-		enum lttng_action_status action_status;
+		const struct lttng_action *subaction;
+		uint64_t action_path_index = 0;
 
 		MSG("  actions:");
-
-		action_status = lttng_action_list_get_count(action, &count);
-		LTTNG_ASSERT(action_status == LTTNG_ACTION_STATUS_OK);
-
-		for (i = 0; i < count; i++) {
-			const uint64_t action_path_index = i;
-			const struct lttng_action *subaction =
-				lttng_action_list_get_at_index(action, i);
-
+		for_each_action_const (subaction, action) {
 			_MSG("    ");
 			print_one_action(trigger, subaction, &action_path_index, 1);
+			action_path_index++;
 		}
 	} else {
 		_MSG(" action:");