Changed njs_object_prop_define() prototype.

diff --git a/njs/njs_object.c b/njs/njs_object.c
index b8e68e47d0455885ca5c5496705f127e3c078f26..3b274eff78779416182a96ae8c45e27ff3204298 100644 (file)
--- a/njs/njs_object.c
+++ b/njs/njs_object.c
@@ -1138,7 +1138,7 @@ njs_object_define_property(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
     name = njs_arg(args, nargs, 2);
 
-    ret = njs_object_prop_define(vm, value, name, descriptor->data.u.object);
+    ret = njs_object_prop_define(vm, value, name, descriptor);
     if (nxt_slow_path(ret != NXT_OK)) {
         return NXT_ERROR;
     }
@@ -1192,8 +1192,7 @@ njs_object_define_properties(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
         }
 
         if (prop->enumerable && njs_is_object(&prop->value)) {
-            ret = njs_object_prop_define(vm, value, &prop->name,
-                                      prop->value.data.u.object);
+            ret = njs_object_prop_define(vm, value, &prop->name, &prop->value);
 
             if (nxt_slow_path(ret != NXT_OK)) {
                 return NXT_ERROR;

diff --git a/njs/njs_object.h b/njs/njs_object.h
index e5e0ca66a2937f0dfbb21f63dc070d02532aeb94..daeda7abf3cc1b0ea426b3d4511f0ff3940dee2b 100644 (file)
--- a/njs/njs_object.h
+++ b/njs/njs_object.h
@@ -117,7 +117,7 @@ njs_object_prop_t *njs_object_prop_alloc(njs_vm_t *vm, const njs_value_t *name,
 njs_object_prop_t *njs_object_property(njs_vm_t *vm, const njs_object_t *obj,
     nxt_lvlhsh_query_t *lhq);
 njs_ret_t njs_object_prop_define(njs_vm_t *vm, njs_value_t *object,
-    const njs_value_t *name, const njs_object_t *descriptor);
+    const njs_value_t *name, const njs_value_t *value);
 njs_ret_t njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest,
     const njs_value_t *value, const njs_value_t *property);
 njs_ret_t njs_prop_private_copy(njs_vm_t *vm, njs_property_query_t *pq);

diff --git a/njs/njs_object_property.c b/njs/njs_object_property.c
index 8a4ed641e0b060b41ce3696900fc7545fa7b137b..3f2211e3286ab95d14676f16eded76156840aec0 100644 (file)
--- a/njs/njs_object_property.c
+++ b/njs/njs_object_property.c
@@ -749,7 +749,7 @@ njs_object_property(njs_vm_t *vm, const njs_object_t *object,
  */
 njs_ret_t
 njs_object_prop_define(njs_vm_t *vm, njs_value_t *object,
-    const njs_value_t *name, const njs_object_t *descriptor)
+    const njs_value_t *name, const njs_value_t *value)
 {
     nxt_int_t             ret;
     njs_object_prop_t     *desc, *current;
@@ -767,7 +767,7 @@ njs_object_prop_define(njs_vm_t *vm, njs_value_t *object,
         return ret;
     }
 
-    desc = njs_descriptor_prop(vm, name, descriptor);
+    desc = njs_descriptor_prop(vm, name, value->data.u.object);
     if (nxt_slow_path(desc == NULL)) {
         return NXT_ERROR;
     }