X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fquery-executor.h;h=a3a376a9d61662436b93f5cd3c5046fe62432440;hb=7b53201cfb06ec02f4203e28458dfbcf53d87988;hp=f2187dd6db030dc3b191d01de0a579833280ef48;hpb=1286dcbb16df452f853c3834aefcff2468abcf05;p=babeltrace.git

diff --git a/include/babeltrace/graph/query-executor.h b/include/babeltrace/graph/query-executor.h
index f2187dd6..a3a376a9 100644
--- a/include/babeltrace/graph/query-executor.h
+++ b/include/babeltrace/graph/query-executor.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_GRAPH_QUERY_EXECUTOR_H
 
 /*
- * BabelTrace - Babeltrace Component Connection Interface
- *
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,44 +23,31 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/types.h>
+/* For enum bt_query_executor_status */
+#include <babeltrace/graph/query-executor.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_value;
 struct bt_query_executor;
 struct bt_component_class;
-
-enum bt_query_status {
-	BT_QUERY_STATUS_OK			= 0,
-	BT_QUERY_STATUS_AGAIN			= 11,
-	BT_QUERY_STATUS_EXECUTOR_CANCELED	= 125,
-	BT_QUERY_STATUS_ERROR			= -1,
-	BT_QUERY_STATUS_INVALID			= -22,
-	BT_QUERY_STATUS_INVALID_OBJECT		= -23,
-	BT_QUERY_STATUS_INVALID_PARAMS		= -24,
-	BT_QUERY_STATUS_NOMEM			= -12,
-};
+struct bt_value;
 
 extern
 struct bt_query_executor *bt_query_executor_create(void);
 
 extern
-enum bt_query_status bt_query_executor_query(
+enum bt_query_executor_status bt_query_executor_query(
 		struct bt_query_executor *query_executor,
-		struct bt_component_class *component_class,
-		const char *object, struct bt_value *params,
-		struct bt_value **result);
+		const struct bt_component_class *component_class,
+		const char *object, const struct bt_value *params,
+		const struct bt_value **result);
 
 extern
-enum bt_query_status bt_query_executor_cancel(
+enum bt_query_executor_status bt_query_executor_cancel(
 		struct bt_query_executor *query_executor);
 
-extern
-bt_bool bt_query_executor_is_canceled(struct bt_query_executor *query_executor);
-
 #ifdef __cplusplus
 }
 #endif