diff mbox

[OpenWrt-Devel,2/3] json_script: fix logic invert of handle_expr_not().

Message ID 1418764537-36787-3-git-send-email-yszhou4tech@gmail.com
State Accepted
Headers show

Commit Message

Yousong Zhou Dec. 16, 2014, 9:15 p.m. UTC 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
 json_script.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Felix Fietkau Dec. 22, 2014, 2:47 p.m. UTC | #1 
On 2014-12-16 22:15, Yousong Zhou wrote:
> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Applied this one and patch 3/3.

Thanks,

- Felix
diff mbox

Patch

diff --git a/json_script.c b/json_script.c
index 6a17d3b..73c2502 100644
--- a/json_script.c
+++ b/json_script.c
@@ -333,12 +333,16 @@  static int handle_expr_or(struct json_call *call, struct blob_attr *expr)
 static int handle_expr_not(struct json_call *call, struct blob_attr *expr)
 {
 	struct blob_attr *tb[3];
+	int ret;
 
 	json_get_tuple(expr, tb, BLOBMSG_TYPE_ARRAY, 0);
 	if (!tb[1])
 		return -1;
 
-	return json_process_expr(call, tb[1]);
+	ret = json_process_expr(call, tb[1]);
+	if (ret < 0)
+		return ret;
+	return !ret;
 }
 
 static const struct json_handler expr[] = {