projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build static version of libblobmsg_json
[project/libubox.git]
/
json_script.c
diff --git
a/json_script.c
b/json_script.c
index
8e7f526
..
73c2502
100644
(file)
--- 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];
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;
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[] = {
}
static const struct json_handler expr[] = {
@@
-592,8
+596,7
@@
static void __json_script_file_free(struct json_script_file *f)
next = f->next;
free(f);
next = f->next;
free(f);
- if (next)
- return __json_script_file_free(next);
+ __json_script_file_free(next);
}
void
}
void