Configuration: reduced names of structures, functions, and macros.

1 files changed, 33 insertions, 36 deletions

diff --git a/src/nxt_conf.h b/src/nxt_conf.h
index fdb324d7..a481d4dc 100644
--- a/src/nxt_conf.h
+++ b/src/nxt_conf.h
@@ -9,61 +9,58 @@
 #define _NXT_CONF_INCLUDED_
 
 
-typedef struct nxt_conf_json_value_s  nxt_conf_json_value_t;
-typedef struct nxt_conf_json_op_s     nxt_conf_json_op_t;
+typedef struct nxt_conf_value_s  nxt_conf_value_t;
+typedef struct nxt_conf_op_s     nxt_conf_op_t;
 
 
 typedef enum {
-    NXT_CONF_JSON_MAP_INT8,
-    NXT_CONF_JSON_MAP_INT32,
-    NXT_CONF_JSON_MAP_INT64,
-    NXT_CONF_JSON_MAP_INT,
-    NXT_CONF_JSON_MAP_SIZE,
-    NXT_CONF_JSON_MAP_OFF,
-    NXT_CONF_JSON_MAP_DOUBLE,
-    NXT_CONF_JSON_MAP_STR,
-    NXT_CONF_JSON_MAP_PTR,
-} nxt_conf_json_map_type_t;
+    NXT_CONF_MAP_INT8,
+    NXT_CONF_MAP_INT32,
+    NXT_CONF_MAP_INT64,
+    NXT_CONF_MAP_INT,
+    NXT_CONF_MAP_SIZE,
+    NXT_CONF_MAP_OFF,
+    NXT_CONF_MAP_DOUBLE,
+    NXT_CONF_MAP_STR,
+    NXT_CONF_MAP_PTR,
+} nxt_conf_map_type_t;
 
 
 typedef struct {
-    nxt_str_t                 name;
-    nxt_conf_json_map_type_t  type;
-    size_t                    offset;
-} nxt_conf_json_object_map_t;
+    nxt_str_t            name;
+    nxt_conf_map_type_t  type;
+    size_t               offset;
+} nxt_conf_map_t;
 
 
 typedef struct {
-    uint32_t                  level;
-    uint8_t                   more_space;  /* 1 bit. */
+    uint32_t             level;
+    uint8_t              more_space;  /* 1 bit. */
 } nxt_conf_json_pretty_t;
 
 
-nxt_conf_json_value_t *nxt_conf_json_get_value(nxt_conf_json_value_t *value,
-    nxt_str_t *path);
-nxt_conf_json_value_t *nxt_conf_json_object_get_member(
-    nxt_conf_json_value_t *value, nxt_str_t *name, uint32_t *index);
-nxt_conf_json_value_t *nxt_conf_json_object_next_member(
-    nxt_conf_json_value_t *value, nxt_str_t *name, uint32_t *next);
+nxt_conf_value_t *nxt_conf_get_path(nxt_conf_value_t *value, nxt_str_t *path);
+nxt_conf_value_t *nxt_conf_get_object_member(nxt_conf_value_t *value,
+    nxt_str_t *name, uint32_t *index);
+nxt_conf_value_t *nxt_conf_next_object_member(nxt_conf_value_t *value,
+    nxt_str_t *name, uint32_t *next);
 
-nxt_int_t nxt_conf_json_object_map(nxt_conf_json_value_t *value,
-    nxt_conf_json_object_map_t *map, void *data);
+nxt_int_t nxt_conf_map_object(nxt_conf_value_t *value, nxt_conf_map_t *map,
+    void *data);
 
-nxt_int_t nxt_conf_json_op_compile(nxt_mp_t *mp, nxt_conf_json_op_t **ops,
-    nxt_conf_json_value_t *root, nxt_str_t *path,
-    nxt_conf_json_value_t *value);
-nxt_conf_json_value_t *nxt_conf_json_clone_value(nxt_mp_t *mp,
-    nxt_conf_json_op_t *op, nxt_conf_json_value_t *value);
+nxt_int_t nxt_conf_op_compile(nxt_mp_t *mp, nxt_conf_op_t **ops,
+    nxt_conf_value_t *root, nxt_str_t *path, nxt_conf_value_t *value);
+nxt_conf_value_t *nxt_conf_clone(nxt_mp_t *mp, nxt_conf_op_t *op,
+    nxt_conf_value_t *value);
 
-nxt_conf_json_value_t *nxt_conf_json_parse(nxt_mp_t *mp, u_char *start,
-    u_char *end);
+nxt_conf_value_t *nxt_conf_json_parse(nxt_mp_t *mp, u_char *start, u_char *end);
 
-#define nxt_conf_json_str_parse(mp, str)                                      \
+#define nxt_conf_json_parse_str(mp, str)                                      \
     nxt_conf_json_parse(mp, (str)->start, (str)->start + (str)->length)
 
-size_t nxt_conf_json_value_length(nxt_conf_json_value_t *value,
+size_t nxt_conf_json_length(nxt_conf_value_t *value,
     nxt_conf_json_pretty_t *pretty);
-u_char *nxt_conf_json_value_print(u_char *p, nxt_conf_json_value_t *value,
+u_char *nxt_conf_json_print(u_char *p, nxt_conf_value_t *value,
     nxt_conf_json_pretty_t *pretty);