diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2017-07-10 17:55:51 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2017-07-10 17:55:51 +0300 |
| commit | eb4c2e4a21c9fa21a677faf7b68cf6dc2dc9137a (patch) | |
| tree | eb28c1e5718cf83de7eea48f14a672ab9c6b6cc3 /src/nxt_conf.c | |
| parent | c0674de78d4f782a8cb775e03e866819910a1198 (diff) | |
| download | unit-eb4c2e4a21c9fa21a677faf7b68cf6dc2dc9137a.tar.gz unit-eb4c2e4a21c9fa21a677faf7b68cf6dc2dc9137a.tar.bz2 | |
Configuration: nxt_conf_map_object() improvements.
Diffstat (limited to 'src/nxt_conf.c')
| -rw-r--r-- | src/nxt_conf.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/nxt_conf.c b/src/nxt_conf.c index 935afab9..2dc4a69c 100644 --- a/src/nxt_conf.c +++ b/src/nxt_conf.c @@ -349,7 +349,8 @@ nxt_conf_get_object_member(nxt_conf_value_t *value, nxt_str_t *name, nxt_int_t -nxt_conf_map_object(nxt_conf_value_t *value, nxt_conf_map_t *map, void *data) +nxt_conf_map_object(nxt_conf_value_t *value, nxt_conf_map_t *map, nxt_uint_t n, + void *data) { nxt_uint_t i; nxt_conf_value_t *v; @@ -367,7 +368,7 @@ nxt_conf_map_object(nxt_conf_value_t *value, nxt_conf_map_t *map, void *data) void *v; } *ptr; - for (i = 0; map[i].name.length != 0; i++) { + for (i = 0; i < n; i++) { v = nxt_conf_get_object_member(value, &map[i].name, NULL); @@ -381,12 +382,10 @@ nxt_conf_map_object(nxt_conf_value_t *value, nxt_conf_map_t *map, void *data) case NXT_CONF_MAP_INT8: - if (v->type != NXT_CONF_VALUE_BOOLEAN) { - return NXT_ERROR; + if (v->type == NXT_CONF_VALUE_BOOLEAN) { + ptr->ui8 = v->u.boolean; } - ptr->ui8 = v->u.boolean; - break; case NXT_CONF_MAP_INT32: @@ -397,7 +396,7 @@ nxt_conf_map_object(nxt_conf_value_t *value, nxt_conf_map_t *map, void *data) case NXT_CONF_MAP_MSEC: if (v->type != NXT_CONF_VALUE_INTEGER) { - return NXT_ERROR; + break; } switch (map[i].type) { @@ -440,22 +439,18 @@ nxt_conf_map_object(nxt_conf_value_t *value, nxt_conf_map_t *map, void *data) } else if (v->type == NXT_CONF_VALUE_INTEGER) { ptr->dbl = v->u.integer; - } else { - return NXT_ERROR; } break; case NXT_CONF_MAP_STR: - if (v->type != NXT_CONF_VALUE_SHORT_STRING - && v->type != NXT_CONF_VALUE_STRING) + if (v->type == NXT_CONF_VALUE_SHORT_STRING + || v->type == NXT_CONF_VALUE_STRING) { - return NXT_ERROR; + nxt_conf_get_string(v, &ptr->str); } - nxt_conf_get_string(v, &ptr->str); - break; |