From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Tue, 18 Dec 2018 20:21:07 +0000 (-0500)
Subject: Fix: setting the wrong status variable on query canceled
X-Git-Url: https://git.efficios.com/?a=commitdiff_plain;h=cb9547eeb64408b69d181a848725572b57427c30;hp=ff3eac88dc790d4ea62f852a45f25ad7815e492b;p=babeltrace.git

Fix: setting the wrong status variable on query canceled

This fixes the following Clang warning:
  query-executor.c:137:12: error: implicit conversion from enumeration type 'enum bt_query_executor_status' to different enumeration type 'enum bt_query_status' [-Werror,-Wenum-conversion]
                status = BT_QUERY_EXECUTOR_STATUS_CANCELED;

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
---

diff --git a/lib/graph/query-executor.c b/lib/graph/query-executor.c
index c7613ce9..d4397a82 100644
--- a/lib/graph/query-executor.c
+++ b/lib/graph/query-executor.c
@@ -134,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;
 	}