Introduced njs_vm_opt_init().

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 49ef5efe4493d27a517ce5e4332d1949acb4b762..4b0d7c2c0c07f80ebd6cf1dede499553e40d656b 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -2404,7 +2404,7 @@ ngx_http_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     end = start + size;
 
-    ngx_memzero(&options, sizeof(njs_vm_opt_t));
+    njs_vm_opt_init(&options);
 
     options.backtrace = 1;
     options.ops = &ngx_http_js_ops;

diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index f9b12e5e6832e5e150ec6fdd893e1e8f63f761ec..78145e981a200a2df5b8c2db325d2c3d7c70c38e 100644 (file)
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -1412,7 +1412,7 @@ ngx_stream_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     end = start + size;
 
-    ngx_memzero(&options, sizeof(njs_vm_opt_t));
+    njs_vm_opt_init(&options);
 
     options.backtrace = 1;
     options.ops = &ngx_stream_js_ops;

diff --git a/src/njs.h b/src/njs.h
index 3a1ca65b4c4a99d7295aa8f9377973141f055f19..4d5d351bdbc649812bb264e5ea84437bc91c381d 100644 (file)
--- a/src/njs.h
+++ b/src/njs.h
@@ -220,6 +220,7 @@ typedef struct {
 } njs_vm_opt_t;
 
 
+NJS_EXPORT void njs_vm_opt_init(njs_vm_opt_t *options);
 NJS_EXPORT njs_vm_t *njs_vm_create(njs_vm_opt_t *options);
 NJS_EXPORT void njs_vm_destroy(njs_vm_t *vm);
 

diff --git a/src/njs_shell.c b/src/njs_shell.c
index 2560c1a2aaf22e2f062494a2f30c6652297146f6..7c521bdac2882c0d3248798e30bcfacf20d0d701 100644 (file)
--- a/src/njs_shell.c
+++ b/src/njs_shell.c
@@ -230,7 +230,7 @@ main(int argc, char **argv)
 
     njs_mm_denormals(opts.denormals);
 
-    njs_memzero(&vm_options, sizeof(njs_vm_opt_t));
+    njs_vm_opt_init(&vm_options);
 
     if (opts.file == NULL) {
         p = getcwd(path, sizeof(path));
@@ -573,7 +573,7 @@ LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 
     opts.silent = 1;
 
-    njs_memzero(&vm_options, sizeof(njs_vm_opt_t));
+    njs_vm_opt_init(&vm_options);
 
     vm_options.init = 1;
     vm_options.backtrace = 0;

diff --git a/src/njs_vm.c b/src/njs_vm.c
index f3551941b70adf4a7fd3ff07c694d530e4799348..552e0184bcfc31b1561205f7eb2d63c0139129fe 100644 (file)
--- a/src/njs_vm.c
+++ b/src/njs_vm.c
@@ -19,6 +19,13 @@ const njs_str_t  njs_entry_unknown =        njs_str("unknown");
 const njs_str_t  njs_entry_anonymous =      njs_str("anonymous");
 
 
+void
+njs_vm_opt_init(njs_vm_opt_t *options)
+{
+    njs_memzero(options, sizeof(njs_vm_opt_t));
+}
+
+
 njs_vm_t *
 njs_vm_create(njs_vm_opt_t *options)
 {

diff --git a/src/test/njs_benchmark.c b/src/test/njs_benchmark.c
index f4697ddda898f5c3cc4a20be87ac46043eb25c07..61e3d4350260b47116a06277de9d4c0e0c0593e0 100644 (file)
--- a/src/test/njs_benchmark.c
+++ b/src/test/njs_benchmark.c
@@ -48,7 +48,7 @@ njs_benchmark_test(njs_vm_t *parent, njs_opts_t *opts, njs_value_t *report,
     static const njs_value_t  usec_key = njs_string("usec");
     static const njs_value_t  times_key = njs_string("times");
 
-    njs_memzero(&options, sizeof(njs_vm_opt_t));
+    njs_vm_opt_init(&options);
 
     vm = NULL;
     nvm = NULL;
@@ -375,7 +375,7 @@ main(int argc, char **argv)
         }
     }
 
-    njs_memzero(&options, sizeof(njs_vm_opt_t));
+    njs_vm_opt_init(&options);
     options.init = 1;
     options.argv = argv;
     options.argc = argc;

diff --git a/src/test/njs_interactive_test.c b/src/test/njs_interactive_test.c
index de7140fb3e037361882ff47331a8a4c223aae52f..b44708f93d3162cb0b2dd0cd1ea55fb1000ddbf0 100644 (file)
--- a/src/test/njs_interactive_test.c
+++ b/src/test/njs_interactive_test.c
@@ -316,7 +316,7 @@ njs_interactive_test(njs_bool_t verbose)
             njs_printf("\"%V\"\n", &test->script);
         }
 
-        njs_memzero(&options, sizeof(njs_vm_opt_t));
+        njs_vm_opt_init(&options);
 
         options.init = 1;
         options.accumulative = 1;

diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
index 8e0a0013efe331e23e57d1ffa10f8b1bd3ec203a..2ce83daea602167f26a0cf6e1fc91c059d59a7ce 100644 (file)
--- a/src/test/njs_unit_test.c
+++ b/src/test/njs_unit_test.c
@@ -17146,7 +17146,7 @@ njs_unit_test(njs_unit_test_t tests[], size_t num, const char *name,
             njs_printf("\"%V\"\n", &tests[i].script);
         }
 
-        njs_memzero(&options, sizeof(njs_vm_opt_t));
+        njs_vm_opt_init(&options);
 
         options.module = opts->module;
         options.unsafe = opts->unsafe;
@@ -17378,7 +17378,7 @@ njs_vm_json_test(njs_opts_t *opts, njs_stat_t *stat)
 
     for (i = 0; i < njs_nitems(tests); i++) {
 
-        memset(&options, 0, sizeof(njs_vm_opt_t));
+        njs_vm_opt_init(&options);
         options.init = 1;
 
         vm = njs_vm_create(&options);
@@ -18007,7 +18007,7 @@ njs_api_test(njs_opts_t *opts, njs_stat_t *stat)
     };
 
     vm = NULL;
-    njs_memzero(&options, sizeof(njs_vm_opt_t));
+    njs_vm_opt_init(&options);
 
     prev = *stat;