Removed unused njs_vm_export_functions().

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 306c5f3b955a1ddee216296b4c9b0fe9d8bb0868..73b284945965188f75d03cd723bcd3a510048377 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -1230,7 +1230,7 @@ ngx_http_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_fd_t               fd;
     ngx_str_t             *value, file;
     nxt_int_t              rc;
-    nxt_str_t              text, ext, *export;
+    nxt_str_t              text, ext;
     nxt_lvlhsh_t           externals;
     ngx_file_info_t        fi;
     njs_vm_shared_t       *shared;
@@ -1327,7 +1327,7 @@ ngx_http_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    rc = njs_vm_compile(jlcf->vm, &start, end, &export);
+    rc = njs_vm_compile(jlcf->vm, &start, end);
 
     if (rc != NJS_OK) {
         njs_vm_exception(jlcf->vm, &text);

diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index f9ab7ac185eb7c2f48fe0c8ead2f2f4cd60f77f7..85884b29503a8c3f416dd55b0f630dc4817ed533 100644 (file)
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -940,7 +940,7 @@ ngx_stream_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_fd_t               fd;
     ngx_str_t             *value, file;
     nxt_int_t              rc;
-    nxt_str_t              text, ext, *export;
+    nxt_str_t              text, ext;
     nxt_lvlhsh_t           externals;
     ngx_file_info_t        fi;
     njs_vm_shared_t       *shared;
@@ -1037,7 +1037,7 @@ ngx_stream_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    rc = njs_vm_compile(jscf->vm, &start, end, &export);
+    rc = njs_vm_compile(jscf->vm, &start, end);
 
     if (rc != NJS_OK) {
         njs_vm_exception(jscf->vm, &text);

diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index 59cd3188d55292029db655dbaeace2f50c56559c..0af2844c172b6cc3b366fb4d921e617d6f026977 100644 (file)
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -489,62 +489,6 @@ njs_name_copy(njs_vm_t *vm, nxt_str_t *dst, nxt_str_t *src)
 }
 
 
-nxt_str_t *
-njs_vm_export_functions(njs_vm_t *vm)
-{
-    size_t             n;
-    nxt_str_t          *ex, *export;
-    njs_value_t        *value;
-    njs_variable_t     *var;
-    nxt_lvlhsh_each_t  lhe;
-
-    n = 1;
-
-    nxt_lvlhsh_each_init(&lhe, &njs_variables_hash_proto);
-
-    for ( ;; ) {
-        var = nxt_lvlhsh_each(&vm->variables_hash, &lhe);
-        if (var == NULL) {
-            break;
-        }
-
-        value = njs_global_variable_value(vm, var);
-
-        if (njs_is_function(value) && !value->data.u.function->native) {
-            n++;
-        }
-    }
-
-    export = nxt_mem_cache_alloc(vm->mem_cache_pool, n * sizeof(nxt_str_t));
-    if (nxt_slow_path(export == NULL)) {
-        return NULL;
-    }
-
-    nxt_lvlhsh_each_init(&lhe, &njs_variables_hash_proto);
-
-    ex = export;
-
-    for ( ;; ) {
-        var = nxt_lvlhsh_each(&vm->variables_hash, &lhe);
-        if (var == NULL) {
-            break;
-        }
-
-        value = njs_global_variable_value(vm, var);
-
-        if (njs_is_function(value) && !value->data.u.function->native) {
-            *ex = var->name;
-            ex++;
-        }
-    }
-
-    ex->length = 0;
-    ex->start = NULL;
-
-    return export;
-}
-
-
 njs_function_t *
 njs_vm_function(njs_vm_t *vm, nxt_str_t *name)
 {

diff --git a/njs/njs_variable.h b/njs/njs_variable.h
index c86e9e2fa5789505a88c887bce89598d1b1e45d5..412fe541e381322a44a074efb99612c96b6ee179 100644 (file)
--- a/njs/njs_variable.h
+++ b/njs/njs_variable.h
@@ -42,8 +42,6 @@ njs_ret_t njs_variables_scope_reference(njs_vm_t *vm,
     njs_parser_scope_t *scope);
 njs_ret_t njs_name_copy(njs_vm_t *vm, nxt_str_t *dst, nxt_str_t *src);
 
-nxt_str_t *njs_vm_export_functions(njs_vm_t *vm);
-
 extern const nxt_lvlhsh_proto_t  njs_variables_hash_proto;
 
 

diff --git a/njs/njscript.c b/njs/njscript.c
index d8c8dd94f7f6e2dac9bc231a94d98081bbbb79a7..ce7cd697d2820f001cd427575bf6e392046cf4c2 100644 (file)
--- a/njs/njscript.c
+++ b/njs/njscript.c
@@ -184,7 +184,7 @@ njs_vm_destroy(njs_vm_t *vm)
 
 
 nxt_int_t
-njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end, nxt_str_t **export)
+njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end)
 {
     nxt_int_t          ret;
     njs_lexer_t        *lexer;
@@ -237,11 +237,6 @@ njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end, nxt_str_t **export)
 
     vm->parser = NULL;
 
-    *export = njs_vm_export_functions(vm);
-    if (nxt_slow_path(*export == NULL)) {
-        return NJS_ERROR;
-    }
-
     return NJS_OK;
 }
 

diff --git a/njs/njscript.h b/njs/njscript.h
index 668f44b5ff287cf186c47304c2d154b2026fe28c..d54ad7d100d7e72fc6e4597e15db75b164b0d78f 100644 (file)
--- a/njs/njscript.h
+++ b/njs/njscript.h
@@ -83,8 +83,7 @@ NXT_EXPORT njs_vm_t *njs_vm_create(nxt_mem_cache_pool_t *mcp,
     njs_vm_shared_t **shared, nxt_lvlhsh_t *externals);
 NXT_EXPORT void njs_vm_destroy(njs_vm_t *vm);
 
-NXT_EXPORT nxt_int_t njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end,
-    nxt_str_t **export);
+NXT_EXPORT nxt_int_t njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end);
 NXT_EXPORT njs_vm_t *njs_vm_clone(njs_vm_t *vm, nxt_mem_cache_pool_t *mcp,
     void **external);
 NXT_EXPORT nxt_int_t njs_vm_call(njs_vm_t *vm, njs_function_t *function,

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index ea5d64453aef9de3e72398e9671de433f48567dc..c564c784ad70beb2b6b83e3313c6b6514417b737 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -8118,7 +8118,7 @@ njs_unit_test(nxt_bool_t disassemble)
     u_char                *start;
     njs_vm_t              *vm, *nvm;
     nxt_int_t             ret;
-    nxt_str_t             s, *export;
+    nxt_str_t             s;
     nxt_uint_t            i;
     nxt_bool_t            success;
     nxt_lvlhsh_t          externals;
@@ -8164,8 +8164,7 @@ njs_unit_test(nxt_bool_t disassemble)
 
         start = njs_test[i].script.start;
 
-        ret = njs_vm_compile(vm, &start, start + njs_test[i].script.length,
-                             &export);
+        ret = njs_vm_compile(vm, &start, start + njs_test[i].script.length);
 
         if (ret == NXT_OK) {
             if (disassemble) {
@@ -8232,7 +8231,7 @@ njs_unit_test_benchmark(nxt_str_t *script, nxt_str_t *result, const char *msg,
     njs_vm_t              *vm, *nvm;
     uint64_t              us;
     nxt_int_t             ret;
-    nxt_str_t             s, *export;
+    nxt_str_t             s;
     nxt_uint_t            i;
     nxt_bool_t            success;
     nxt_lvlhsh_t          externals;
@@ -8266,7 +8265,7 @@ njs_unit_test_benchmark(nxt_str_t *script, nxt_str_t *result, const char *msg,
 
     start = script->start;
 
-    ret = njs_vm_compile(vm, &start, start + script->length, &export);
+    ret = njs_vm_compile(vm, &start, start + script->length);
     if (ret != NXT_OK) {
         return NXT_ERROR;
     }