X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=json_script.c;h=0ec7b382ad94d4bbdb64156210243513af9daf30;hp=ba1e49835c1af277234593c9ab2dd30d37b8ac9f;hb=bae6bd19f32e6b8b5578a71bdcd53f735d35f0d0;hpb=178fe974af1d0fa4130f865f7b494b0d6b1b05a4 diff --git a/json_script.c b/json_script.c index ba1e498..0ec7b38 100644 --- a/json_script.c +++ b/json_script.c @@ -553,10 +553,9 @@ static int json_process_cmd(struct json_call *call, struct blob_attr *block) return 0; } -void json_script_run(struct json_script_ctx *ctx, const char *name, - struct blob_attr *vars) +void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *file, + struct blob_attr *vars) { - struct json_script_file *file; static unsigned int _seq = 0; struct json_call call = { .ctx = ctx, @@ -568,19 +567,33 @@ void json_script_run(struct json_script_ctx *ctx, const char *name, if (!call.seq) call.seq = ++_seq; + __json_script_run(&call, file, NULL); +} + +void json_script_run(struct json_script_ctx *ctx, const char *name, + struct blob_attr *vars) +{ + struct json_script_file *file; + file = json_script_get_file(ctx, name); if (!file) return; - __json_script_run(&call, file, NULL); + json_script_run_file(ctx, file, vars); } -static void __json_script_file_free(struct json_script_ctx *ctx, struct json_script_file *f) +static void __json_script_file_free(struct json_script_file *f) { struct json_script_file *next; - for (next = f->next; f; f = next, next = f->next) - free(f); + if (!f) + return; + + next = f->next; + free(f); + + if (next) + return __json_script_file_free(next); } void @@ -589,7 +602,7 @@ json_script_free(struct json_script_ctx *ctx) struct json_script_file *f, *next; avl_remove_all_elements(&ctx->files, f, avl, next) - __json_script_file_free(ctx, f); + __json_script_file_free(f); blob_buf_free(&ctx->buf); }