Using njs_is_defined() where appropriate.

diff --git a/src/njs_array.c b/src/njs_array.c
index cbdd6e00f889f2296f96e0ef9a82ad90cdb7e10d..2e083a7f420086a4cb38638f55295c7d17989632 100644 (file)
--- a/src/njs_array.c
+++ b/src/njs_array.c
@@ -434,8 +434,8 @@ njs_array_prototype_slice(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         length = 0;
 
     } else {
-        if (!njs_is_undefined(njs_arg(args, nargs, 2))) {
-            end = njs_primitive_value_to_integer(&args[2]);
+        if (njs_is_defined(njs_arg(args, nargs, 2))) {
+            end = njs_primitive_value_to_integer(njs_argument(args, 2));
 
         } else {
             end = length;

diff --git a/src/njs_json.c b/src/njs_json.c
index b20b7ba9f666d4626260716990d6c39d217f5dce..09c2d5d7625a79c987dc85fda9ea12a2572afbac 100644 (file)
--- a/src/njs_json.c
+++ b/src/njs_json.c
@@ -1408,7 +1408,7 @@ start:
             break;
 
         case NJS_JSON_ARRAY_TO_JSON_REPLACED:
-            if (!njs_is_undefined(&stringify->retval)
+            if (njs_is_defined(&stringify->retval)
                 && njs_is_function(&stringify->replacer))
             {
                 ret = njs_json_stringify_replacer(vm, stringify, NULL,

diff --git a/src/njs_object_prop.c b/src/njs_object_prop.c
index fd9539fddecab8d1430520505b924b5460a9c1b8..81d4d39ca970786b21d75a1ef9f64b4aff768794 100644 (file)
--- a/src/njs_object_prop.c
+++ b/src/njs_object_prop.c
@@ -348,7 +348,7 @@ njs_descriptor_prop(njs_vm_t *vm, const njs_value_t *name,
 
     pr = njs_object_property(vm, desc, &pq);
     if (pr != NULL) {
-        if (!njs_is_undefined(&pr->value) && !njs_is_function(&pr->value)) {
+        if (njs_is_defined(&pr->value) && !njs_is_function(&pr->value)) {
             njs_type_error(vm, "Getter must be a function");
             return NULL;
         }
@@ -365,7 +365,7 @@ njs_descriptor_prop(njs_vm_t *vm, const njs_value_t *name,
 
     pr = njs_object_property(vm, desc, &pq);
     if (pr != NULL) {
-        if (!njs_is_undefined(&pr->value) && !njs_is_function(&pr->value)) {
+        if (njs_is_defined(&pr->value) && !njs_is_function(&pr->value)) {
             njs_type_error(vm, "Setter must be a function");
             return NULL;
         }

diff --git a/src/njs_regexp.c b/src/njs_regexp.c
index 1f49db8e97fe6fcc03467e7f65a001a7cf92f68e..a7507291628f61ac4ba0cf60619f4bb7e5d14f21 100644 (file)
--- a/src/njs_regexp.c
+++ b/src/njs_regexp.c
@@ -148,7 +148,7 @@ njs_regexp_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         pattern = &source;
     }
 
-    if (!njs_is_undefined(flags)) {
+    if (njs_is_defined(flags)) {
         ret = njs_primitive_value_to_string(vm, &flags_string, flags);
         if (njs_slow_path(ret != NJS_OK)) {
             return ret;

diff --git a/src/njs_string.c b/src/njs_string.c
index e1bd5013ea80afe5b3b01818fea6f81234f07613..2da29d0884113cb624433dd69f9d9e5c99e92166 100644 (file)
--- a/src/njs_string.c
+++ b/src/njs_string.c
@@ -1290,8 +1290,8 @@ njs_string_slice_args(njs_slice_prop_t *slice, njs_value_t *args,
         length = 0;
 
     } else {
-        if (!njs_is_undefined(njs_arg(args, nargs, 2))) {
-            value = njs_arg(args, nargs, 2);
+        if (njs_is_defined(njs_arg(args, nargs, 2))) {
+            value = njs_argument(args, 2);
             end = njs_number(value);
 
         } else {