Replaced ngx_conf_full_name() with ngx_get_full_name().

The ngx_get_full_name() function takes more readable arguments list.

7 files changed, 23 insertions, 8 deletions

diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 34c3b190d..711871b6c 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -1327,7 +1327,7 @@ ngx_http_geo_include(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
 
     ngx_sprintf(file.data, "%V.bin%Z", name);
 
-    if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
+    if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index aa6a3fcee..505ae3b22 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -1134,7 +1134,9 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 
     } else {
-        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+        if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &value[1])
+            != NGX_OK)
+        {
             return NGX_CONF_ERROR;
         }
 
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index 9e85693bc..6bf38285b 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -892,7 +892,7 @@ ngx_http_xslt_stylesheet(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_memzero(sheet, sizeof(ngx_http_xslt_sheet_t));
 
-    if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+    if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &value[1]) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index 90e32e80e..a8a418422 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -485,7 +485,9 @@ ngx_http_perl_init_interpreter(ngx_conf_t *cf, ngx_http_perl_main_conf_t *pmcf)
     if (pmcf->modules != NGX_CONF_UNSET_PTR) {
         m = pmcf->modules->elts;
         for (i = 0; i < pmcf->modules->nelts; i++) {
-            if (ngx_conf_full_name(cf->cycle, &m[i], 0) != NGX_OK) {
+            if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &m[i])
+                != NGX_OK)
+            {
                 return NGX_CONF_ERROR;
             }
         }
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index ffe7fb4fe..5273fe32c 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3686,7 +3686,9 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         if (prev->root.data == NULL) {
             ngx_str_set(&conf->root, "html");
 
-            if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) {
+            if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &conf->root)
+                != NGX_OK)
+            {
                 return NGX_CONF_ERROR;
             }
         }
@@ -4428,7 +4430,9 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     if (clcf->root.data[0] != '$') {
-        if (ngx_conf_full_name(cf->cycle, &clcf->root, 0) != NGX_OK) {
+        if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &clcf->root)
+            != NGX_OK)
+        {
             return NGX_CONF_ERROR;
         }
     }
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index eacca595a..0b90c4150 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1626,7 +1626,9 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         cache->path->name.len--;
     }
 
-    if (ngx_conf_full_name(cf->cycle, &cache->path->name, 0) != NGX_OK) {
+    if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &cache->path->name)
+        != NGX_OK)
+    {
         return NGX_CONF_ERROR;
     }
 
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 1da793b8f..7af48ee00 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -131,7 +131,12 @@ ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv)
     if ((v->len == 0 || v->data[0] != '$')
         && (ccv->conf_prefix || ccv->root_prefix))
     {
-        if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) {
+        if (ngx_get_full_name(ccv->cf->pool,
+                              ccv->conf_prefix ? &ccv->cf->cycle->conf_prefix:
+                                                 &ccv->cf->cycle->prefix,
+                              v)
+            != NGX_OK)
+        {
             return NGX_ERROR;
         }