Style.

diff --git a/njs/njs_object.c b/njs/njs_object.c
index ded41480afd44883b1bd857cb5629cef22ad9812..b3d6df090885d7bccd96266042e01052bc3fec07 100644 (file)
--- a/njs/njs_object.c
+++ b/njs/njs_object.c
@@ -1142,7 +1142,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_define_property(vm, value, name, descriptor->data.u.object);
+    ret = njs_object_prop_define(vm, value, name, descriptor->data.u.object);
     if (nxt_slow_path(ret != NXT_OK)) {
         return NXT_ERROR;
     }
@@ -1196,7 +1196,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_define_property(vm, value, &prop->name,
+            ret = njs_object_prop_define(vm, value, &prop->name,
                                       prop->value.data.u.object);
 
             if (nxt_slow_path(ret != NXT_OK)) {
@@ -1227,7 +1227,7 @@ njs_object_get_own_property_descriptor(njs_vm_t *vm, njs_value_t *args,
 
     property = njs_arg(args, nargs, 2);
 
-    return njs_object_property_descriptor(vm, &vm->retval, value, property);
+    return njs_object_prop_descriptor(vm, &vm->retval, value, property);
 }
 
 
@@ -1271,7 +1271,7 @@ njs_object_get_own_property_descriptors(njs_vm_t *vm, njs_value_t *args,
 
     for (i = 0; i < length; i++) {
         key = &names->start[i];
-        ret = njs_object_property_descriptor(vm, &descriptor, value, key);
+        ret = njs_object_prop_descriptor(vm, &descriptor, value, key);
         if (nxt_slow_path(ret != NXT_OK)) {
             return ret;
         }

diff --git a/njs/njs_object.h b/njs/njs_object.h
index 115637c4f9f0f04de485254771a868822c22c216..e5e0ca66a2937f0dfbb21f63dc070d02532aeb94 100644 (file)
--- a/njs/njs_object.h
+++ b/njs/njs_object.h
@@ -14,7 +14,7 @@ typedef enum {
     NJS_METHOD,
     NJS_PROPERTY_HANDLER,
     NJS_WHITEOUT,
-} njs_object_property_type_t;
+} njs_object_prop_type_t;
 
 
 /*
@@ -33,7 +33,7 @@ typedef struct {
     njs_value_t                 value;
     njs_value_t                 name;
 
-    njs_object_property_type_t  type:8;          /* 3 bits */
+    njs_object_prop_type_t      type:8;          /* 3 bits */
 
     njs_object_attribute_t      writable:8;      /* 2 bits */
     njs_object_attribute_t      enumerable:8;    /* 2 bits */
@@ -116,12 +116,12 @@ njs_object_prop_t *njs_object_prop_alloc(njs_vm_t *vm, const njs_value_t *name,
     const njs_value_t *value, uint8_t attributes);
 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_define_property(njs_vm_t *vm, njs_value_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);
-njs_ret_t njs_object_property_descriptor(njs_vm_t *vm, njs_value_t *dest,
+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);
-const char *njs_prop_type_string(njs_object_property_type_t type);
+const char *njs_prop_type_string(njs_object_prop_type_t type);
 
 extern const njs_object_init_t  njs_object_constructor_init;
 extern const njs_object_init_t  njs_object_prototype_init;

diff --git a/njs/njs_object_property.c b/njs/njs_object_property.c
index 60ff3d40d1251f8678baf457f4f705fe3ccfaeb4..8a4ed641e0b060b41ce3696900fc7545fa7b137b 100644 (file)
--- a/njs/njs_object_property.c
+++ b/njs/njs_object_property.c
@@ -748,8 +748,8 @@ njs_object_property(njs_vm_t *vm, const njs_object_t *object,
  *   (values can be set, but without property flags support).
  */
 njs_ret_t
-njs_define_property(njs_vm_t *vm, njs_value_t *object, const njs_value_t *name,
-    const njs_object_t *descriptor)
+njs_object_prop_define(njs_vm_t *vm, njs_value_t *object,
+    const njs_value_t *name, const njs_object_t *descriptor)
 {
     nxt_int_t             ret;
     njs_object_prop_t     *desc, *current;
@@ -970,7 +970,7 @@ static const njs_value_t  njs_object_configurable_string =
 
 
 njs_ret_t
-njs_object_property_descriptor(njs_vm_t *vm, njs_value_t *dest,
+njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest,
     const njs_value_t *value, const njs_value_t *property)
 {
     nxt_int_t             ret;
@@ -1192,7 +1192,7 @@ njs_prop_private_copy(njs_vm_t *vm, njs_property_query_t *pq)
 
 
 const char *
-njs_prop_type_string(njs_object_property_type_t type)
+njs_prop_type_string(njs_object_prop_type_t type)
 {
     switch (type) {
     case NJS_PROPERTY_REF: