Simplify, by calling nxt_conf_get_string_dup()

Refactor.

Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Cc: Zhidao Hong <z.hong@f5.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

2 files changed, 10 insertions, 17 deletions

diff --git a/src/nxt_http_static.c b/src/nxt_http_static.c
index c4caab3c..ee25015e 100644
--- a/src/nxt_http_static.c
+++ b/src/nxt_http_static.c
@@ -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");
 
     } else {
-        nxt_conf_get_string(acf->index, &str);
-
-        ret = nxt_str_dup(mp, &conf->index, &str);
+        ret = nxt_conf_get_string_dup(acf->index, mp, &conf->index);
         if (nxt_slow_path(ret == NULL)) {
             return NXT_ERROR;
         }
diff --git a/src/nxt_router.c b/src/nxt_router.c
index 0b979575..947836c8 100644
--- a/src/nxt_router.c
+++ b/src/nxt_router.c
@@ -2275,7 +2275,7 @@ nxt_router_conf_process_static(nxt_task_t *task, nxt_router_conf_t *rtcf,
 {
     uint32_t          next, i;
     nxt_mp_t          *mp;
-    nxt_str_t         *type, exten, str;
+    nxt_str_t         *type, exten, str, *s;
     nxt_int_t         ret;
     nxt_uint_t        exts;
     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) {
-                nxt_conf_get_string(ext_conf, &str);
-
-                if (nxt_slow_path(nxt_str_dup(mp, &exten, &str) == NULL)) {
+                s = nxt_conf_get_string_dup(ext_conf, mp, &exten);
+                if (nxt_slow_path(s == NULL)) {
                     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++) {
                 value = nxt_conf_get_array_element(ext_conf, i);
 
-                nxt_conf_get_string(value, &str);
-
-                if (nxt_slow_path(nxt_str_dup(mp, &exten, &str) == NULL)) {
+                s = nxt_conf_get_string_dup(value, mp, &exten);
+                if (nxt_slow_path(s == NULL)) {
                     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_http_forward_header_t *fh)
 {
-    char       c;
-    size_t     i;
-    uint32_t   hash;
-    nxt_str_t  header;
-
-    nxt_conf_get_string(conf, &header);
+    char      c;
+    size_t    i;
+    uint32_t  hash;
 
-    fh->header = nxt_str_dup(mp, NULL, &header);
+    fh->header = nxt_conf_get_string_dup(conf, mp, NULL);
     if (nxt_slow_path(fh->header == NULL)) {
         return NXT_ERROR;
     }