diff options
| -rw-r--r-- | src/nxt_conf.h | 2 | ||||
| -rw-r--r-- | src/nxt_conf_json.c | 4 | ||||
| -rw-r--r-- | src/nxt_controller.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nxt_conf.h b/src/nxt_conf.h index 43154a8f..d0ecfc5f 100644 --- a/src/nxt_conf.h +++ b/src/nxt_conf.h @@ -18,7 +18,7 @@ typedef struct { } nxt_conf_json_pretty_t; -nxt_conf_json_value_t *nxt_conf_json_value_get(nxt_conf_json_value_t *value, +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, u_char *name, size_t length); diff --git a/src/nxt_conf_json.c b/src/nxt_conf_json.c index 618ed28c..77f8089f 100644 --- a/src/nxt_conf_json.c +++ b/src/nxt_conf_json.c @@ -108,7 +108,7 @@ nxt_conf_json_indentation(u_char *pos, nxt_conf_json_pretty_t *pretty) nxt_conf_json_value_t * -nxt_conf_json_value_get(nxt_conf_json_value_t *value, nxt_str_t *path) +nxt_conf_json_get_value(nxt_conf_json_value_t *value, nxt_str_t *path) { u_char *p, *start, *end; @@ -397,7 +397,7 @@ nxt_conf_json_parse_object(u_char *pos, u_char *end, object = nxt_mem_alloc(pool, sizeof(nxt_conf_json_object_t) + count * sizeof(nxt_conf_json_obj_member_t)); if (nxt_slow_path(object == NULL)) { - return NULL; + goto error; } value->u.object = object; diff --git a/src/nxt_controller.c b/src/nxt_controller.c index f70b481c..15c7b0cd 100644 --- a/src/nxt_controller.c +++ b/src/nxt_controller.c @@ -571,7 +571,7 @@ nxt_controller_process_request(nxt_task_t *task, nxt_event_conn_t *c, path.length = req->parser.target_end - path.start; } - value = nxt_conf_json_value_get(nxt_controller_conf.root, &path); + value = nxt_conf_json_get_value(nxt_controller_conf.root, &path); if (value != NULL) { nxt_str_set(&resp.status_line, "200 OK"); |