lib: rename include dir to babeltrace2

[babeltrace.git] / lib / graph / query-executor.c

diff --git a/lib/graph/query-executor.c b/lib/graph/query-executor.c
index d72165291efc0e51af545086d2f6825775ae5b69..5c8e33e14af79d332c864d37bd5c0c0de15854ac 100644 (file)
--- a/lib/graph/query-executor.c
+++ b/lib/graph/query-executor.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -21,20 +21,19 @@
  */
 
 #define BT_LOG_TAG "QUERY-EXECUTOR"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/graph/query-executor-const.h>
-#include <babeltrace/graph/query-executor.h>
-#include <babeltrace/graph/query-executor-internal.h>
-#include <babeltrace/graph/component-class.h>
-#include <babeltrace/graph/component-class-internal.h>
-#include <babeltrace/value.h>
-#include <babeltrace/value-const.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/object.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/graph/query-executor-const.h>
+#include <babeltrace2/graph/query-executor.h>
+#include <babeltrace2/graph/query-executor-internal.h>
+#include <babeltrace2/graph/component-class.h>
+#include <babeltrace2/graph/component-class-internal.h>
+#include <babeltrace2/value.h>
+#include <babeltrace2/value-const.h>
+#include <babeltrace2/object-internal.h>
+#include <babeltrace2/compiler-internal.h>
 
 static
 void bt_query_executor_destroy(struct bt_object *obj)
@@ -135,7 +134,7 @@ enum bt_query_executor_status bt_query_executor_query(
        exec_status = (int) status;
        if (query_exec->canceled) {
                BT_OBJECT_PUT_REF_AND_RESET(*user_result);
-               status = BT_QUERY_EXECUTOR_STATUS_CANCELED;
+               exec_status = BT_QUERY_EXECUTOR_STATUS_CANCELED;
                goto end;
        }
 
@@ -157,3 +156,13 @@ bt_bool bt_query_executor_is_canceled(const struct bt_query_executor *query_exec
        BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
        return query_exec->canceled;
 }
+
+void bt_query_executor_get_ref(const struct bt_query_executor *query_executor)
+{
+       bt_object_get_ref(query_executor);
+}
+
+void bt_query_executor_put_ref(const struct bt_query_executor *query_executor)
+{
+       bt_object_put_ref(query_executor);
+}