X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist_triggers.cpp;h=e7075844520eaeb7da3a90f086545e047969ac5c;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=0691a982c9839a7a3ddb2fde9d13e143c8d6cd76;hpb=35c4b2b3fec47b84bf169557ea23454881b76027;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list_triggers.cpp b/src/bin/lttng/commands/list_triggers.cpp
index 0691a982c..e70758445 100644
--- a/src/bin/lttng/commands/list_triggers.cpp
+++ b/src/bin/lttng/commands/list_triggers.cpp
@@ -7,21 +7,21 @@
 
 #include <stdio.h>
 
-#include "../command.h"
+#include "../command.hpp"
 
 #include "common/argpar/argpar.h"
-#include "common/argpar-utils/argpar-utils.h"
-#include "common/dynamic-array.h"
-#include "common/mi-lttng.h"
+#include "common/argpar-utils/argpar-utils.hpp"
+#include "common/dynamic-array.hpp"
+#include "common/mi-lttng.hpp"
 /* For lttng_condition_type_str(). */
-#include "lttng/condition/condition-internal.h"
+#include "lttng/condition/condition-internal.hpp"
 #include "lttng/condition/event-rule-matches.h"
-#include "lttng/condition/event-rule-matches-internal.h"
+#include "lttng/condition/event-rule-matches-internal.hpp"
 /* For lttng_domain_type_str(). */
-#include "lttng/domain-internal.h"
+#include "lttng/domain-internal.hpp"
 /* For lttng_event_rule_kernel_syscall_emission_site_str() */
-#include "lttng/event-rule/kernel-syscall-internal.h"
-#include "../loglevel.h"
+#include "lttng/event-rule/kernel-syscall-internal.hpp"
+#include "../loglevel.hpp"
 #include <lttng/lttng.h>
 
 #ifdef LTTNG_EMBED_HELP
@@ -748,7 +748,6 @@ static void print_condition_event_rule_matches(
 }
 
 static void print_action_errors(const struct lttng_trigger *trigger,
-		const struct lttng_action *action,
 		const uint64_t *action_path_indexes,
 		size_t action_path_length)
 {
@@ -963,7 +962,7 @@ void print_one_action(const struct lttng_trigger *trigger,
 	}
 
 	MSG("");
-	print_action_errors(trigger, action, action_path_indexes,
+	print_action_errors(trigger, action_path_indexes,
 			action_path_length);
 
 end:
@@ -1336,8 +1335,9 @@ int cmd_list_triggers(int argc, const char **argv)
 		enum parse_next_item_status status;
 
 		status = parse_next_item(argpar_iter, &argpar_item, 1, argv,
-			true, NULL);
-		if (status == PARSE_NEXT_ITEM_STATUS_ERROR) {
+			true, NULL, NULL);
+		if (status == PARSE_NEXT_ITEM_STATUS_ERROR ||
+				status == PARSE_NEXT_ITEM_STATUS_ERROR_MEMORY) {
 			goto error;
 		} else if (status == PARSE_NEXT_ITEM_STATUS_END) {
 			break;