Replaced vm with mp in NJS_CHB_MP_INIT().

12 files changed, 17 insertions, 17 deletions

diff --git a/src/njs_array.c b/src/njs_array.c
index 15a6b6d3..913bc8cf 100644
--- a/src/njs_array.c
+++ b/src/njs_array.c
@@ -1686,7 +1686,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     value = &entry;
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     for (i = 0; i < len; i++) {
         ret = njs_value_property_i64(vm, this, i, value);
diff --git a/src/njs_chb.h b/src/njs_chb.h
index 3dbe5ac9..4bd1cb3f 100644
--- a/src/njs_chb.h
+++ b/src/njs_chb.h
@@ -34,8 +34,8 @@ typedef struct {
 
 void njs_chb_init(njs_chb_t *chain, void *pool, njs_chb_alloc_t alloc,
     njs_chb_free_t free);
-#define NJS_CHB_MP_INIT(chain, vm)                                           \
-    njs_chb_init(chain, njs_vm_memory_pool(vm), (njs_chb_alloc_t) njs_mp_alloc,\
+#define NJS_CHB_MP_INIT(chain, mp)                                           \
+    njs_chb_init(chain, mp, (njs_chb_alloc_t) njs_mp_alloc,                  \
     (njs_chb_free_t) njs_mp_free)
 #define NJS_CHB_CTX_INIT(chain, ctx)                                         \
     njs_chb_init(chain, ctx, (njs_chb_alloc_t) js_malloc,                    \
diff --git a/src/njs_error.c b/src/njs_error.c
index 6a14d767..b9da6597 100644
--- a/src/njs_error.c
+++ b/src/njs_error.c
@@ -1149,7 +1149,7 @@ njs_backtrace_to_string(njs_vm_t *vm, njs_arr_t *backtrace, njs_str_t *dst)
         return NJS_OK;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     njs_chb_append_str(&chain, dst);
     njs_chb_append(&chain, "\n", 1);
diff --git a/src/njs_function.c b/src/njs_function.c
index c677be57..326549f5 100644
--- a/src/njs_function.c
+++ b/src/njs_function.c
@@ -1032,7 +1032,7 @@ njs_function_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         goto fail;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     if (async) {
         njs_chb_append_literal(&chain, "(async function(");
diff --git a/src/njs_json.c b/src/njs_json.c
index 85c5d0e8..8ba13314 100644
--- a/src/njs_json.c
+++ b/src/njs_json.c
@@ -1093,7 +1093,7 @@ njs_json_stringify_iterator(njs_json_stringify_t *stringify,
         goto memory_error;
     }
 
-    NJS_CHB_MP_INIT(&chain, stringify->vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(stringify->vm));
 
     for ( ;; ) {
         if (state->index == 0) {
@@ -1977,7 +1977,7 @@ njs_vm_value_dump(njs_vm_t *vm, njs_str_t *retval, njs_value_t *value,
         value = &exception;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     if (!njs_dump_is_recursive(value)) {
         ret = njs_dump_terminal(stringify, &chain, value, console);
diff --git a/src/njs_regexp.c b/src/njs_regexp.c
index 1c7cfe87..479f0b75 100644
--- a/src/njs_regexp.c
+++ b/src/njs_regexp.c
@@ -1373,7 +1373,7 @@ njs_regexp_prototype_symbol_replace(njs_vm_t *vm, njs_value_t *args,
         }
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     results.separate = 0;
     results.pointer = 0;
diff --git a/src/njs_string.c b/src/njs_string.c
index 9405a8db..6a91cb4c 100644
--- a/src/njs_string.c
+++ b/src/njs_string.c
@@ -2955,7 +2955,7 @@ njs_string_get_substitution(njs_vm_t *vm, njs_value_t *matched,
     p = rep.start;
     end = rep.start + rep.length;
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     while (p < end) {
         r = njs_strlchr(p, end, '$');
@@ -3244,7 +3244,7 @@ njs_string_prototype_replace(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         return NJS_OK;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     start = string.start;
 
@@ -3899,7 +3899,7 @@ njs_string_decode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
     src = string.start;
     end = string.start + string.size;
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     njs_utf8_decode_init(&ctx);
 
@@ -4173,7 +4173,7 @@ njs_string_atob(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     len = njs_base64_decoded_length(len, pad);
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     dst = njs_chb_reserve(&chain, len * 2);
     if (njs_slow_path(dst == NULL)) {
diff --git a/src/njs_typed_array.c b/src/njs_typed_array.c
index 2a485a19..5930dcb0 100644
--- a/src/njs_typed_array.c
+++ b/src/njs_typed_array.c
@@ -2131,7 +2131,7 @@ njs_typed_array_prototype_join(njs_vm_t *vm, njs_value_t *args,
         return NJS_ERROR;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     njs_typed_array_to_chain(vm, &chain, array, separator);
 
diff --git a/src/njs_vm.c b/src/njs_vm.c
index dbeffa51..43b2ccc2 100644
--- a/src/njs_vm.c
+++ b/src/njs_vm.c
@@ -233,7 +233,7 @@ njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end)
     }
 
     if (njs_slow_path(vm->options.ast)) {
-        NJS_CHB_MP_INIT(&chain, vm);
+        NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
         ret = njs_parser_serialize_ast(parser.node, &chain);
         if (njs_slow_path(ret == NJS_ERROR)) {
             return ret;
diff --git a/src/test/njs_benchmark.c b/src/test/njs_benchmark.c
index 98c618c8..66c4e84b 100644
--- a/src/test/njs_benchmark.c
+++ b/src/test/njs_benchmark.c
@@ -745,7 +745,7 @@ njs_benchmark_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     } else if (memcmp(mode.start, "chb", 3) == 0) {
 
-        NJS_CHB_MP_INIT(&chain, vm);
+        NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
         njs_chb_append_literal(&chain, "abc");
         njs_chb_append(&chain, s.start, s.length);
diff --git a/src/test/njs_externals_test.c b/src/test/njs_externals_test.c
index 7d2e82af..33f0020a 100644
--- a/src/test/njs_externals_test.c
+++ b/src/test/njs_externals_test.c
@@ -323,7 +323,7 @@ njs_unit_test_r_header(njs_vm_t *vm, njs_object_prop_t *prop,
 
     ret = njs_vm_prop_name(vm, prop, &h);
     if (ret == NJS_OK) {
-        NJS_CHB_MP_INIT(&chain, vm);
+        NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
         njs_chb_append(&chain, h.start, h.length);
         njs_chb_append(&chain, (u_char *) "|АБВ", njs_length("|АБВ"));
diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
index 980fd7fa..9c935e5b 100644
--- a/src/test/njs_unit_test.c
+++ b/src/test/njs_unit_test.c
@@ -22399,7 +22399,7 @@ njs_chb_test(njs_vm_t *vm, njs_opts_t *opts, njs_stat_t *stat)
 
     static const njs_str_t  expected = njs_str("arg: \"XYZ\" -5");
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     p = njs_chb_reserve(&chain, 513);
     if (p == NULL) {