lib: force user to include `<babeltrace2/babeltrace.h>`

[babeltrace.git] / include / babeltrace2 / graph / query-executor.h

diff --git a/include/babeltrace2/graph/query-executor.h b/include/babeltrace2/graph/query-executor.h
index fe5c4789013c769b2d17ce49309f3cd603dade98..2992cb477a13da6e7812fe664cf91681486bf578 100644 (file)
--- a/include/babeltrace2/graph/query-executor.h
+++ b/include/babeltrace2/graph/query-executor.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_GRAPH_QUERY_EXECUTOR_H
-#define BABELTRACE_GRAPH_QUERY_EXECUTOR_H
+#ifndef BABELTRACE2_GRAPH_QUERY_EXECUTOR_H
+#define BABELTRACE2_GRAPH_QUERY_EXECUTOR_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -23,8 +23,9 @@
  * SOFTWARE.
  */
 
-/* For bt_query_executor_status */
-#include <babeltrace2/graph/query-executor.h>
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
 
 /* For bt_query_executor, bt_component_class, bt_value */
 #include <babeltrace2/types.h>
@@ -39,19 +40,34 @@ extern "C" {
 extern
 bt_query_executor *bt_query_executor_create(void);
 
+typedef enum bt_query_executor_query_status {
+       BT_QUERY_EXECUTOR_QUERY_STATUS_OK               = __BT_FUNC_STATUS_OK,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_AGAIN            = __BT_FUNC_STATUS_AGAIN,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_UNSUPPORTED      = __BT_FUNC_STATUS_UNSUPPORTED,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_CANCELED         = __BT_FUNC_STATUS_CANCELED,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_ERROR            = __BT_FUNC_STATUS_ERROR,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_MEMORY_ERROR     = __BT_FUNC_STATUS_MEMORY_ERROR,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_INVALID_OBJECT   = __BT_FUNC_STATUS_INVALID_OBJECT,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_INVALID_PARAMS   = __BT_FUNC_STATUS_INVALID_PARAMS,
+} bt_query_executor_query_status;
+
 extern
-bt_query_executor_status bt_query_executor_query(
+bt_query_executor_query_status bt_query_executor_query(
                bt_query_executor *query_executor,
                const bt_component_class *component_class,
                const char *object, const bt_value *params,
                bt_logging_level logging_level, const bt_value **result);
 
+typedef enum bt_query_executor_cancel_status {
+       BT_QUERY_EXECUTOR_CANCEL_STATUS_OK      = __BT_FUNC_STATUS_OK,
+} bt_query_executor_cancel_status;
+
 extern
-bt_query_executor_status bt_query_executor_cancel(
+bt_query_executor_cancel_status bt_query_executor_cancel(
                bt_query_executor *query_executor);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* BABELTRACE_GRAPH_QUERY_EXECUTOR_H */
+#endif /* BABELTRACE2_GRAPH_QUERY_EXECUTOR_H */