projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uloop: fix build using C++ compilers
[project/libubox.git]
/
json_script.c
diff --git
a/json_script.c
b/json_script.c
index 463aac88dee42cef14e848f878a0548c96c0134d..7177e9cb12e605bd716fad9147c34cc817422b6a 100644
(file)
--- a/
json_script.c
+++ b/
json_script.c
@@
-95,7
+95,7
@@
const char *json_script_find_var(struct json_script_ctx *ctx, struct blob_attr *
const char *name)
{
struct blob_attr *cur;
const char *name)
{
struct blob_attr *cur;
-
in
t rem;
+
size_
t rem;
blobmsg_for_each_attr(cur, vars, rem) {
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
blobmsg_for_each_attr(cur, vars, rem) {
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
@@
-164,7
+164,7
@@
static int handle_case(struct json_call *call, struct blob_attr *expr)
{
struct blob_attr *tb[3], *cur;
const char *var;
{
struct blob_attr *tb[3], *cur;
const char *var;
-
in
t rem;
+
size_
t rem;
json_get_tuple(expr, tb, BLOBMSG_TYPE_STRING, BLOBMSG_TYPE_TABLE);
if (!tb[1] || !tb[2])
json_get_tuple(expr, tb, BLOBMSG_TYPE_STRING, BLOBMSG_TYPE_TABLE);
if (!tb[1] || !tb[2])
@@
-233,7
+233,7
@@
static int expr_eq_regex(struct json_call *call, struct blob_attr *expr, bool re
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *tb[3], *cur;
const char *var;
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *tb[3], *cur;
const char *var;
-
in
t rem;
+
size_
t rem;
json_get_tuple(expr, tb, BLOBMSG_TYPE_STRING, 0);
if (!tb[1] || !tb[2])
json_get_tuple(expr, tb, BLOBMSG_TYPE_STRING, 0);
if (!tb[1] || !tb[2])
@@
-277,7
+277,7
@@
static int handle_expr_has(struct json_call *call, struct blob_attr *expr)
{
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *tb[3], *cur;
{
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *tb[3], *cur;
-
in
t rem;
+
size_
t rem;
json_get_tuple(expr, tb, 0, 0);
if (!tb[1])
json_get_tuple(expr, tb, 0, 0);
if (!tb[1])
@@
-306,7
+306,8
@@
static int handle_expr_has(struct json_call *call, struct blob_attr *expr)
static int expr_and_or(struct json_call *call, struct blob_attr *expr, bool and)
{
struct blob_attr *cur;
static int expr_and_or(struct json_call *call, struct blob_attr *expr, bool and)
{
struct blob_attr *cur;
- int ret, rem;
+ int ret;
+ size_t rem;
int i = 0;
blobmsg_for_each_attr(cur, expr, rem) {
int i = 0;
blobmsg_for_each_attr(cur, expr, rem) {
@@
-415,8
+416,10
@@
static int json_process_expr(struct json_call *call, struct blob_attr *cur)
}
ret = __json_process_type(call, cur, expr, ARRAY_SIZE(expr), &found);
}
ret = __json_process_type(call, cur, expr, ARRAY_SIZE(expr), &found);
- if (!found)
- ctx->handle_error(ctx, "Unknown expression type", cur);
+ if (!found) {
+ const char *name = blobmsg_data(blobmsg_data(cur));
+ ctx->handle_expr(ctx, name, cur, call->vars);
+ }
return ret;
}
return ret;
}
@@
-428,7
+431,7
@@
static int eval_string(struct json_call *call, struct blob_buf *buf, const char
bool var = false;
char c = '%';
bool var = false;
char c = '%';
- dest = blobmsg_alloc_string_buffer(buf, name,
1
);
+ dest = blobmsg_alloc_string_buffer(buf, name,
0
);
if (!dest)
return -1;
if (!dest)
return -1;
@@
-470,7
+473,7
@@
static int eval_string(struct json_call *call, struct blob_buf *buf, const char
cur_len = end - str;
}
cur_len = end - str;
}
- new_buf = blobmsg_realloc_string_buffer(buf, len + cur_len
+ 1
);
+ new_buf = blobmsg_realloc_string_buffer(buf, len + cur_len);
if (!new_buf) {
/* Make eval_string return -1 */
var = true;
if (!new_buf) {
/* Make eval_string return -1 */
var = true;
@@
-513,7
+516,8
@@
static int cmd_process_strings(struct json_call *call, struct blob_attr *attr)
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *cur;
int args = -1;
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *cur;
int args = -1;
- int rem, ret;
+ int ret;
+ size_t rem;
void *c;
blob_buf_init(&ctx->buf, 0);
void *c;
blob_buf_init(&ctx->buf, 0);
@@
-570,7
+574,7
@@
static int json_process_cmd(struct json_call *call, struct blob_attr *block)
{
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *cur;
{
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *cur;
-
in
t rem;
+
size_
t rem;
int ret;
int i = 0;
int ret;
int i = 0;
@@
-587,6
+591,7
@@
static int json_process_cmd(struct json_call *call, struct blob_attr *block)
case BLOBMSG_TYPE_STRING:
if (!i)
return __json_process_cmd(call, block);
case BLOBMSG_TYPE_STRING:
if (!i)
return __json_process_cmd(call, block);
+ fallthrough;
default:
ret = json_process_cmd(call, cur);
if (ret < -1)
default:
ret = json_process_cmd(call, cur);
if (ret < -1)
@@
-671,6
+676,7
@@
static int
__default_handle_expr(struct json_script_ctx *ctx, const char *name,
struct blob_attr *expr, struct blob_attr *vars)
{
__default_handle_expr(struct json_script_ctx *ctx, const char *name,
struct blob_attr *expr, struct blob_attr *vars)
{
+ ctx->handle_error(ctx, "Unknown expression type", expr);
return -1;
}
return -1;
}