Renaming ngx_js_retval() to ngx_js_exception().

After previous commit ngx_js_retval() is only used for getting the
exception value and should be renamed to better reflect the purpose.

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 6c74a4e57614564bce6252d55865084e38f7df54..5500cc04078f10c04ecadd21db076d77d7147da8 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -1401,7 +1401,7 @@ ngx_http_js_init_vm(ngx_http_request_t *r, njs_int_t proto_id)
     }
 
     if (njs_vm_start(ctx->vm, njs_value_arg(&retval)) == NJS_ERROR) {
-        ngx_js_retval(ctx->vm, NULL, &exception);
+        ngx_js_exception(ctx->vm, &exception);
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "js exception: %V", &exception);
@@ -4526,7 +4526,7 @@ ngx_http_js_handle_vm_event(ngx_http_request_t *r, njs_vm_event_t vm_event,
                    (ngx_int_t) rc, vm_event);
 
     if (rc == NJS_ERROR) {
-        ngx_js_retval(ctx->vm, NULL, &exception);
+        ngx_js_exception(ctx->vm, &exception);
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "js exception: %V", &exception);

diff --git a/nginx/ngx_js.c b/nginx/ngx_js.c
index 2a9acc6dbf0b3830d39eff8ba2777e4c16e53cbb..4c0f8c29a666062c3a0104711491dd2db891401a 100644 (file)
--- a/nginx/ngx_js.c
+++ b/nginx/ngx_js.c
@@ -359,7 +359,7 @@ ngx_js_invoke(njs_vm_t *vm, ngx_str_t *fname, ngx_log_t *log,
     ret = njs_vm_invoke(vm, func, njs_value_arg(args), nargs,
                         njs_value_arg(retval));
     if (ret == NJS_ERROR) {
-        ngx_js_retval(vm, NULL, &exception);
+        ngx_js_exception(vm, &exception);
 
         ngx_log_error(NGX_LOG_ERR, log, 0,
                       "js exception: %V", &exception);
@@ -369,7 +369,7 @@ ngx_js_invoke(njs_vm_t *vm, ngx_str_t *fname, ngx_log_t *log,
 
     ret = njs_vm_run(vm);
     if (ret == NJS_ERROR) {
-        ngx_js_retval(vm, NULL, &exception);
+        ngx_js_exception(vm, &exception);
 
         ngx_log_error(NGX_LOG_ERR, log, 0,
                       "js exception: %V", &exception);
@@ -382,18 +382,12 @@ ngx_js_invoke(njs_vm_t *vm, ngx_str_t *fname, ngx_log_t *log,
 
 
 ngx_int_t
-ngx_js_retval(njs_vm_t *vm, njs_opaque_value_t *retval, ngx_str_t *s)
+ngx_js_exception(njs_vm_t *vm, ngx_str_t *s)
 {
     njs_int_t  ret;
     njs_str_t  str;
 
-    if (retval != NULL && njs_value_is_valid(njs_value_arg(retval))) {
-        ret = njs_vm_value_string(vm, &str, njs_value_arg(retval));
-
-    } else {
-        ret = njs_vm_exception_string(vm, &str);
-    }
-
+    ret = njs_vm_exception_string(vm, &str);
     if (ret != NJS_OK) {
         return NGX_ERROR;
     }

diff --git a/nginx/ngx_js.h b/nginx/ngx_js.h
index f50b7fb31952ae4b4f0c49a8712ecb0b31362528..e7653ece9c63f3e507192d6b4cd94835325e94a5 100644 (file)
--- a/nginx/ngx_js.h
+++ b/nginx/ngx_js.h
@@ -133,8 +133,7 @@ ngx_int_t ngx_js_call(njs_vm_t *vm, ngx_str_t *fname, ngx_log_t *log,
     njs_opaque_value_t *args, njs_uint_t nargs);
 ngx_int_t ngx_js_invoke(njs_vm_t *vm, ngx_str_t *fname, ngx_log_t *log,
     njs_opaque_value_t *args, njs_uint_t nargs, njs_opaque_value_t *retval);
-ngx_int_t ngx_js_retval(njs_vm_t *vm, njs_opaque_value_t *retval,
-    ngx_str_t *s);
+ngx_int_t ngx_js_exception(njs_vm_t *vm, ngx_str_t *s);
 
 njs_int_t ngx_js_ext_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
     njs_index_t level, njs_value_t *retval);

diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index 1a36d4158eb07ddc60878110fa01fa1c0baa2035..e13f6f7fe6a37beab64d5640d3d7478e96eca7be 100644 (file)
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -754,7 +754,7 @@ ngx_stream_js_phase_handler(ngx_stream_session_t *s, ngx_str_t *name)
 
     ret = ngx_stream_js_run_event(s, ctx, &ctx->events[NGX_JS_EVENT_UPLOAD], 0);
     if (ret != NJS_OK) {
-        ngx_js_retval(ctx->vm, NULL, &exception);
+        ngx_js_exception(ctx->vm, &exception);
 
         ngx_log_error(NGX_LOG_ERR, c->log, 0, "js exception: %V",
                       &exception);
@@ -841,7 +841,7 @@ ngx_stream_js_body_filter(ngx_stream_session_t *s, ngx_chain_t *in,
         if (event->ev != NULL) {
             ret = ngx_stream_js_run_event(s, ctx, event, from_upstream);
             if (ret != NJS_OK) {
-                ngx_js_retval(ctx->vm, NULL, &exception);
+                ngx_js_exception(ctx->vm, &exception);
 
                 ngx_log_error(NGX_LOG_ERR, c->log, 0, "js exception: %V",
                               &exception);
@@ -1063,7 +1063,7 @@ ngx_stream_js_init_vm(ngx_stream_session_t *s, njs_int_t proto_id)
     }
 
     if (njs_vm_start(ctx->vm, njs_value_arg(&retval)) == NJS_ERROR) {
-        ngx_js_retval(ctx->vm, NULL, &exception);
+        ngx_js_exception(ctx->vm, &exception);
 
         ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
                       "js exception: %V", &exception);
@@ -1812,7 +1812,7 @@ ngx_stream_js_handle_event(ngx_stream_session_t *s, njs_vm_event_t vm_event,
                    (ngx_int_t) rc, vm_event);
 
     if (rc == NJS_ERROR) {
-        ngx_js_retval(ctx->vm, NULL, &exception);
+        ngx_js_exception(ctx->vm, &exception);
 
         ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
                       "js exception: %V", &exception);