Unifying return code variable name.

Using "ret" everywhere.

diff --git a/src/njs_builtin.c b/src/njs_builtin.c
index 570640413ac03dae77a2e1e7341d37f6285bac4f..ff078c213a8652a0fdfde823a8c93032f7981b94 100644 (file)
--- a/src/njs_builtin.c
+++ b/src/njs_builtin.c
@@ -1000,29 +1000,29 @@ njs_builtin_match_native_function(njs_vm_t *vm, njs_function_t *function,
 {
     size_t                     len;
     njs_str_t                  string, middle;
-    njs_int_t                  rc;
+    njs_int_t                  ret;
     const njs_object_init_t    *obj, **p;
     const njs_object_prop_t    *prop;
     const njs_function_init_t  *fun;
 
     middle = njs_str_value(".");
 
-    rc = njs_builtin_match(njs_object_init, function, &prop, &obj);
+    ret = njs_builtin_match(njs_object_init, function, &prop, &obj);
 
-    if (rc == NJS_OK) {
+    if (ret == NJS_OK) {
         goto found;
     }
 
-    rc = njs_builtin_match(njs_prototype_init, function, &prop, &obj);
+    ret = njs_builtin_match(njs_prototype_init, function, &prop, &obj);
 
-    if (rc == NJS_OK) {
+    if (ret == NJS_OK) {
         middle = njs_str_value(".prototype.");
         goto found;
     }
 
-    rc = njs_builtin_match(njs_constructor_init, function, &prop, &obj);
+    ret = njs_builtin_match(njs_constructor_init, function, &prop, &obj);
 
-    if (rc == NJS_OK) {
+    if (ret == NJS_OK) {
         goto found;
     }
 
@@ -1036,9 +1036,9 @@ njs_builtin_match_native_function(njs_vm_t *vm, njs_function_t *function,
         }
     }
 
-    rc = njs_builtin_match(njs_module_init, function, &prop, &obj);
+    ret = njs_builtin_match(njs_module_init, function, &prop, &obj);
 
-    if (rc == NJS_OK) {
+    if (ret == NJS_OK) {
         goto found;
     }
 

diff --git a/src/njs_vm.c b/src/njs_vm.c
index e34eed49143a198ff92b205b9fe9bb541c93db63..78241134179d0094e7b682a21e0572eabaa59d8e 100644 (file)
--- a/src/njs_vm.c
+++ b/src/njs_vm.c
@@ -946,7 +946,6 @@ njs_vm_object_alloc(njs_vm_t *vm, njs_value_t *retval, ...)
 {
     va_list             args;
     njs_int_t           ret;
-    njs_int_t           rc;
     njs_value_t         *name, *value;
     njs_object_t        *object;
     njs_object_prop_t   *prop;
@@ -957,7 +956,7 @@ njs_vm_object_alloc(njs_vm_t *vm, njs_value_t *retval, ...)
         return NJS_ERROR;
     }
 
-    rc = NJS_ERROR;
+    ret = NJS_ERROR;
 
     va_start(args, retval);
 
@@ -999,7 +998,7 @@ njs_vm_object_alloc(njs_vm_t *vm, njs_value_t *retval, ...)
         }
     }
 
-    rc = NJS_OK;
+    ret = NJS_OK;
 
     njs_set_object(retval, object);
 
@@ -1007,7 +1006,7 @@ done:
 
     va_end(args);
 
-    return rc;
+    return ret;
 }
 
 

diff --git a/src/test/njs_benchmark.c b/src/test/njs_benchmark.c
index 4dccfa27868d20b0de92ad455334816965df2acc..ac033975cb68b9a779e66cfcb430b744ca578195 100644 (file)
--- a/src/test/njs_benchmark.c
+++ b/src/test/njs_benchmark.c
@@ -19,7 +19,7 @@ njs_unit_test_benchmark(njs_str_t *script, njs_str_t *result, const char *msg,
     u_char         *start;
     njs_vm_t       *vm, *nvm;
     uint64_t       us;
-    njs_int_t      ret, rc;
+    njs_int_t      ret;
     njs_str_t      s;
     njs_uint_t     i;
     njs_bool_t     success;
@@ -30,7 +30,7 @@ njs_unit_test_benchmark(njs_str_t *script, njs_str_t *result, const char *msg,
 
     vm = NULL;
     nvm = NULL;
-    rc = NJS_ERROR;
+    ret = NJS_ERROR;
 
     vm = njs_vm_create(&options);
     if (vm == NULL) {
@@ -85,7 +85,7 @@ njs_unit_test_benchmark(njs_str_t *script, njs_str_t *result, const char *msg,
                    msg, (double) us / n, (int) ((uint64_t) n * 1000000 / us));
     }
 
-    rc = NJS_OK;
+    ret = NJS_OK;
 
 done:
 
@@ -97,7 +97,7 @@ done:
         njs_vm_destroy(vm);
     }
 
-    return rc;
+    return ret;
 }
 
 

diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
index f3691cca419b54fda2f2df1d9e75e8ffe6977546..6bc3a096e17ba750c5b81baf0d0c6d5fcf1a4536 100644 (file)
--- a/src/test/njs_unit_test.c
+++ b/src/test/njs_unit_test.c
@@ -14111,7 +14111,7 @@ njs_unit_test(njs_unit_test_t tests[], size_t num, const char *name,
 {
     u_char        *start;
     njs_vm_t      *vm, *nvm;
-    njs_int_t     ret, rc;
+    njs_int_t     ret;
     njs_str_t     s;
     njs_uint_t    i;
     njs_stat_t    prev;
@@ -14123,7 +14123,7 @@ njs_unit_test(njs_unit_test_t tests[], size_t num, const char *name,
 
     prev = *stat;
 
-    rc = NJS_ERROR;
+    ret = NJS_ERROR;
 
     for (i = 0; i < num; i++) {
 
@@ -14196,7 +14196,7 @@ njs_unit_test(njs_unit_test_t tests[], size_t num, const char *name,
         vm = NULL;
     }
 
-    rc = NJS_OK;
+    ret = NJS_OK;
 
 done:
 
@@ -14210,7 +14210,7 @@ done:
 
     njs_unit_test_report(name, &prev, stat);
 
-    return rc;
+    return ret;
 }
 
 
@@ -14302,7 +14302,7 @@ static njs_int_t
 njs_vm_json_test(njs_opts_t *opts, njs_stat_t *stat)
 {
     njs_vm_t      *vm;
-    njs_int_t     ret, rc;
+    njs_int_t     ret;
     njs_str_t     s, *script;
     njs_uint_t    i;
     njs_bool_t    success;
@@ -14334,7 +14334,7 @@ njs_vm_json_test(njs_opts_t *opts, njs_stat_t *stat)
 
     prev = *stat;
 
-    rc = NJS_ERROR;
+    ret = NJS_ERROR;
 
     for (i = 0; i < njs_nitems(tests); i++) {
 
@@ -14404,11 +14404,11 @@ njs_vm_json_test(njs_opts_t *opts, njs_stat_t *stat)
 
     }
 
-    rc = NJS_OK;
+    ret = NJS_OK;
 
 done:
 
-    if (rc != NJS_OK) {
+    if (ret != NJS_OK) {
         if (njs_vm_retval_string(vm, &s) != NJS_OK) {
             njs_printf("njs_vm_retval_string() failed\n");
 
@@ -14423,7 +14423,7 @@ done:
         njs_vm_destroy(vm);
     }
 
-    return rc;
+    return ret;
 }
 
 
@@ -14564,7 +14564,7 @@ static njs_int_t
 njs_api_test(njs_opts_t *opts, njs_stat_t *stat)
 {
     njs_vm_t      *vm;
-    njs_int_t     ret, rc;
+    njs_int_t     ret;
     njs_uint_t    i;
     njs_stat_t    prev;
     njs_vm_opt_t  options;
@@ -14586,7 +14586,7 @@ njs_api_test(njs_opts_t *opts, njs_stat_t *stat)
 
     prev = *stat;
 
-    rc = NJS_ERROR;
+    ret = NJS_ERROR;
 
     for (i = 0; i < njs_nitems(tests); i++) {
         vm = njs_vm_create(&options);
@@ -14605,7 +14605,7 @@ njs_api_test(njs_opts_t *opts, njs_stat_t *stat)
         vm = NULL;
     }
 
-    rc = NJS_OK;
+    ret = NJS_OK;
 
 done:
 
@@ -14615,7 +14615,7 @@ done:
         njs_vm_destroy(vm);
     }
 
-    return rc;
+    return ret;
 }