details: http://hg.nginx.org/njs/rev/c85b07c96e27
branches:
changeset: 579:c85b07c96e27
user: Dmitry Volyntsev <xeioex@nginx.com>
date: Tue Jul 31 21:11:44 2018 +0300
description:
Fixed error code typo introduced in 5f00966ffff8.

diffstat:

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(-)

diffs (130 lines):

diff -r 9d9dfeb98aff -r c85b07c96e27 nginx/ngx_http_js_module.c
--- a/nginx/ngx_http_js_module.c Tue Jul 31 15:30:01 2018 +0300
+++ b/nginx/ngx_http_js_module.c Tue Jul 31 21:11:44 2018 +0300
@@ -1258,7 +1258,7 @@ ngx_http_js_ext_send_header(njs_vm_t *vm

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_v

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

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

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

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, n

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,

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 -r 9d9dfeb98aff -r c85b07c96e27 nginx/ngx_stream_js_module.c
--- a/nginx/ngx_stream_js_module.c Tue Jul 31 15:30:01 2018 +0300
+++ b/nginx/ngx_stream_js_module.c Tue Jul 31 21:11:44 2018 +0300
@@ -888,7 +888,7 @@ ngx_stream_js_ext_log_core(njs_vm_t *vm,

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 -r 9d9dfeb98aff -r c85b07c96e27 njs/test/njs_unit_test.c
--- a/njs/test/njs_unit_test.c Tue Jul 31 15:30:01 2018 +0300
+++ b/njs/test/njs_unit_test.c Tue Jul 31 21:11:44 2018 +0300
@@ -9788,7 +9788,7 @@ njs_unit_test_method_external(njs_vm_t *

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->retval = njs_value_void;

- return NXT_OK;
+ return NJS_OK;
}


@@ -9814,13 +9814,13 @@ njs_unit_test_create_external(njs_vm_t *

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 *

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:

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel