const char *name)
{
struct blob_attr *cur;
- int rem;
+ size_t rem;
blobmsg_for_each_attr(cur, vars, rem) {
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
{
struct blob_attr *tb[3], *cur;
const char *var;
- int rem;
+ size_t rem;
json_get_tuple(expr, tb, BLOBMSG_TYPE_STRING, BLOBMSG_TYPE_TABLE);
if (!tb[1] || !tb[2])
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *tb[3], *cur;
const char *var;
- int rem;
+ size_t rem;
json_get_tuple(expr, tb, BLOBMSG_TYPE_STRING, 0);
if (!tb[1] || !tb[2])
{
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *tb[3], *cur;
- int rem;
+ size_t rem;
json_get_tuple(expr, tb, 0, 0);
if (!tb[1])
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) {
}
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;
}
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;
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;
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);
{
struct json_script_ctx *ctx = call->ctx;
struct blob_attr *cur;
- int rem;
+ size_t rem;
int ret;
int i = 0;
case BLOBMSG_TYPE_STRING:
if (!i)
return __json_process_cmd(call, block);
+ fallthrough;
default:
ret = json_process_cmd(call, cur);
if (ret < -1)
__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;
}