From a930e69784ad999c07160e4ef3617debffe5fcc6 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Tue, 31 Jul 2018 21:11:44 +0300 Subject: [PATCH] Fixed error code typo introduced in 5f00966ffff8. --- nginx/ngx_http_js_module.c | 14 +++++++------- nginx/ngx_stream_js_module.c | 2 +- njs/test/njs_unit_test.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index 25dd457b..d07508a5 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -1258,7 +1258,7 @@ ngx_http_js_ext_send_header(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_arg(args, nargs, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } if (ngx_http_send_header(r) == NGX_ERROR) { @@ -1283,7 +1283,7 @@ ngx_http_js_ext_send(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_arg(args, nargs, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } out = NULL; @@ -1351,7 +1351,7 @@ ngx_http_js_ext_finish(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_arg(args, nargs, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } if (ngx_http_send_special(r, NGX_HTTP_LAST) == NGX_ERROR) { @@ -1410,7 +1410,7 @@ ngx_http_js_ext_return(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_argument(args, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } ctx = ngx_http_get_module_ctx(r, ngx_http_js_module); @@ -1451,7 +1451,7 @@ ngx_http_js_ext_internal_redirect(njs_vm_t *vm, njs_value_t *args, r = njs_vm_external(vm, njs_argument(args, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } ctx = ngx_http_get_module_ctx(r, ngx_http_js_module); @@ -1512,7 +1512,7 @@ ngx_http_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_arg(args, nargs, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } c = r->connection; @@ -1895,7 +1895,7 @@ ngx_http_js_ext_subrequest(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_argument(args, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } ctx = ngx_http_get_module_ctx(r, ngx_http_js_module); diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c index 0464acc6..7b31a53e 100644 --- a/nginx/ngx_stream_js_module.c +++ b/nginx/ngx_stream_js_module.c @@ -888,7 +888,7 @@ ngx_stream_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, s = njs_vm_external(vm, njs_arg(args, nargs, 0)); if (nxt_slow_path(s == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } c = s->connection; diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c index 2e5ebe66..47fdedc2 100644 --- a/njs/test/njs_unit_test.c +++ b/njs/test/njs_unit_test.c @@ -9788,7 +9788,7 @@ njs_unit_test_method_external(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_arg(args, nargs, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } ret = njs_vm_value_to_ext_string(vm, &s, njs_arg(args, nargs, 1), 0); @@ -9799,7 +9799,7 @@ njs_unit_test_method_external(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, vm->retval = njs_value_void; - return NXT_OK; + return NJS_OK; } @@ -9814,13 +9814,13 @@ njs_unit_test_create_external(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, r = njs_vm_external(vm, njs_arg(args, nargs, 0)); if (nxt_slow_path(r == NULL)) { - return NXT_ERROR; + return NJS_ERROR; } if (njs_vm_value_to_ext_string(vm, &uri, njs_arg(args, nargs, 1), 0) != NJS_OK) { - return NXT_ERROR; + return NJS_ERROR; } value = nxt_mem_cache_zalloc(r->mem_cache_pool, sizeof(njs_opaque_value_t)); @@ -9839,12 +9839,12 @@ njs_unit_test_create_external(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, ret = njs_vm_external_create(vm, value, sr->proto, sr); if (ret != NXT_OK) { - return NXT_ERROR; + return NJS_ERROR; } njs_vm_retval_set(vm, value); - return NXT_OK; + return NJS_OK; memory_error: -- 2.47.3