From d416bf66555c9398f81b4546c96084b1d311fd8d Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 28 Apr 2014 17:54:25 +0200 Subject: [PATCH] json_script: add json_script_run_file() Signed-off-by: Felix Fietkau --- json_script.c | 15 +++++++++++---- json_script.h | 2 ++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/json_script.c b/json_script.c index ba1e498..9d5e9d2 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,11 +567,19 @@ 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) diff --git a/json_script.h b/json_script.h index 25cc04f..9475baa 100644 --- a/json_script.h +++ b/json_script.h @@ -97,6 +97,8 @@ void json_script_free(struct json_script_ctx *ctx); void json_script_run(struct json_script_ctx *ctx, const char *filename, struct blob_attr *vars); +void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *file, + struct blob_attr *vars); /* * json_script_eval_string - evaluate a string and store the result *