X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fquery-executor.h;h=336de60e1e1292bedd646e10248b6826cdc9bc52;hb=7e69c04f557e46fb50e5a888a3bc3451afbd3b8e;hp=f2187dd6db030dc3b191d01de0a579833280ef48;hpb=c7eee084ca459af66ba1f6d375fba3f89db93584;p=babeltrace.git

diff --git a/include/babeltrace/graph/query-executor.h b/include/babeltrace/graph/query-executor.h
index f2187dd6..336de60e 100644
--- a/include/babeltrace/graph/query-executor.h
+++ b/include/babeltrace/graph/query-executor.h
@@ -2,9 +2,7 @@
 #define BABELTRACE_GRAPH_QUERY_EXECUTOR_H
 
 /*
- * BabelTrace - Babeltrace Component Connection Interface
- *
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,43 +23,29 @@
  * SOFTWARE.
  */
 
+/* For bt_query_executor_status */
+#include <babeltrace/graph/query-executor.h>
+
+/* For bt_query_executor, bt_component_class, bt_value */
 #include <babeltrace/types.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,
-};
-
-extern
-struct bt_query_executor *bt_query_executor_create(void);
-
 extern
-enum bt_query_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);
+bt_query_executor *bt_query_executor_create(void);
 
 extern
-enum bt_query_status bt_query_executor_cancel(
-		struct bt_query_executor *query_executor);
+bt_query_executor_status bt_query_executor_query(
+		bt_query_executor *query_executor,
+		const bt_component_class *component_class,
+		const char *object, const bt_value *params,
+		const bt_value **result);
 
 extern
-bt_bool bt_query_executor_is_canceled(struct bt_query_executor *query_executor);
+bt_query_executor_status bt_query_executor_cancel(
+		bt_query_executor *query_executor);
 
 #ifdef __cplusplus
 }