technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify, by calling nxt_conf_get_string_dup()

Browse Source 
Refactor.

Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Cc: Zhidao Hong <z.hong@f5.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-02-02 23:43:13 +01:00
parent ecd573924f
commit bb376c6838
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nxt_http_static.c
View File

@@ -117,9 +117,7 @@ nxt_http_static_init(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
nxt_str_set(&conf->index, "index.html"); nxt_str_set(&conf->index, "index.html");
} else { } else {
nxt_conf_get_string(acf->index, &str); ret = nxt_conf_get_string_dup(acf->index, mp, &conf->index);
ret = nxt_str_dup(mp, &conf->index, &str);
if (nxt_slow_path(ret == NULL)) { if (nxt_slow_path(ret == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }

23
src/nxt_router.c
View File

@@ -2275,7 +2275,7 @@ nxt_router_conf_process_static(nxt_task_t *task, nxt_router_conf_t *rtcf,
{ {
uint32_t next, i; uint32_t next, i;
nxt_mp_t *mp; nxt_mp_t *mp;
nxt_str_t *type, exten, str; nxt_str_t *type, exten, str, *s;
nxt_int_t ret; nxt_int_t ret;
nxt_uint_t exts; nxt_uint_t exts;
nxt_conf_value_t *mtypes_conf, *ext_conf, *value; nxt_conf_value_t *mtypes_conf, *ext_conf, *value;
@@ -2311,9 +2311,8 @@ nxt_router_conf_process_static(nxt_task_t *task, nxt_router_conf_t *rtcf,
} }
if (nxt_conf_type(ext_conf) == NXT_CONF_STRING) { if (nxt_conf_type(ext_conf) == NXT_CONF_STRING) {
nxt_conf_get_string(ext_conf, &str); s = nxt_conf_get_string_dup(ext_conf, mp, &exten);
if (nxt_slow_path(s == NULL)) {
if (nxt_slow_path(nxt_str_dup(mp, &exten, &str) == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }
@@ -2331,9 +2330,8 @@ nxt_router_conf_process_static(nxt_task_t *task, nxt_router_conf_t *rtcf,
for (i = 0; i < exts; i++) { for (i = 0; i < exts; i++) {
value = nxt_conf_get_array_element(ext_conf, i); value = nxt_conf_get_array_element(ext_conf, i);
nxt_conf_get_string(value, &str); s = nxt_conf_get_string_dup(value, mp, &exten);
if (nxt_slow_path(s == NULL)) {
if (nxt_slow_path(nxt_str_dup(mp, &exten, &str) == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }
@@ -2425,14 +2423,11 @@ static nxt_int_t
nxt_router_conf_forward_header(nxt_mp_t *mp, nxt_conf_value_t *conf, nxt_router_conf_forward_header(nxt_mp_t *mp, nxt_conf_value_t *conf,
nxt_http_forward_header_t *fh) nxt_http_forward_header_t *fh)
{ {
char c; char c;
size_t i; size_t i;
uint32_t hash; uint32_t hash;
nxt_str_t header;
nxt_conf_get_string(conf, &header); fh->header = nxt_conf_get_string_dup(conf, mp, NULL);
fh->header = nxt_str_dup(mp, NULL, &header);
if (nxt_slow_path(fh->header == NULL)) { if (nxt_slow_path(fh->header == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }