From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Tue, 18 Jun 2019 17:27:25 +0000 (+0300)
Subject: Changed njs_object_prop_define() prototype.
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/%7B@url%7D?a=commitdiff_plain;h=771e966be1ef55e7d7c86fc65f1899f639115782;p=njs.git

Changed njs_object_prop_define() prototype.
---

diff --git a/njs/njs_object.c b/njs/njs_object.c
index b8e68e47..3b274eff 100644
--- 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 e5e0ca66..daeda7ab 100644
--- 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 8a4ed641..3f2211e3 100644
--- 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;
     }