X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror-query.c;h=c4a28e9c49f0237caea0bbb55931f490d13bc959;hb=27993cc2e9edb3f5a59bc2c16439e063462235e5;hp=8bee203977ddec1c27a6b399f53b78a4e6ceb479;hpb=c7627a89bbd6696a667acf0f52cc8a4fe876d3f1;p=lttng-tools.git

diff --git a/src/common/error-query.c b/src/common/error-query.c
index 8bee20397..c4a28e9c4 100644
--- a/src/common/error-query.c
+++ b/src/common/error-query.c
@@ -13,6 +13,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <lttng/action/action-internal.h>
 #include <lttng/action/list-internal.h>
+#include <lttng/action/path-internal.h>
 #include <lttng/error-query-internal.h>
 #include <lttng/error-query.h>
 #include <lttng/trigger/trigger-internal.h>
@@ -47,9 +48,9 @@ struct lttng_error_query_action {
 	struct lttng_trigger *trigger;
 	/*
 	 * Index of the target action. Since action lists can't be nested,
-	 * the targetted action is the top-level group if the action_index is
+	 * the targetted action is the top-level list if the action_index is
 	 * unset. Otherwise, the index refers to the index within the top-level
-	 * group.
+	 * list.
 	 */
 	LTTNG_OPTIONAL(unsigned int) action_index;
 };
@@ -150,7 +151,7 @@ extern struct lttng_error_query *lttng_error_query_action_create(
 	 */
 	if (action != trigger->action &&
 			lttng_action_get_type(trigger->action) ==
-					LTTNG_ACTION_TYPE_GROUP) {
+					LTTNG_ACTION_TYPE_LIST) {
 		unsigned int i, action_list_count;
 		enum lttng_action_status action_status;
 
@@ -178,7 +179,7 @@ extern struct lttng_error_query *lttng_error_query_action_create(
 		}
 	} else {
 		/*
-		 * Trigger action is not a group and not equal to the target
+		 * Trigger action is not a list and not equal to the target
 		 * action; invalid action provided.
 		 */
 		goto error;
@@ -681,8 +682,8 @@ struct lttng_action *lttng_error_query_action_borrow_action_target(
 		target_action = trigger_action;
 	} else {
 		if (lttng_action_get_type(trigger_action) !=
-				LTTNG_ACTION_TYPE_GROUP) {
-			ERR("Invalid action error query target index: trigger action is not a group");
+				LTTNG_ACTION_TYPE_LIST) {
+			ERR("Invalid action error query target index: trigger action is not a list");
 			goto end;
 		}
 
@@ -827,7 +828,7 @@ ssize_t lttng_error_query_create_from_payload(struct lttng_payload_view *view,
 			target_action = trigger->action;
 		} else {
 			if (lttng_action_get_type(trigger->action) !=
-					LTTNG_ACTION_TYPE_GROUP) {
+					LTTNG_ACTION_TYPE_LIST) {
 				used_size = -1;
 				goto end;
 			}