jshn: shorten JSON_VAR to J_V

[project/libubox.git] / json_script.c

diff --git a/json_script.c b/json_script.c
index ba1e498..0ec7b38 100644 (file)
--- 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);
 }