Replaced ngx_conf_full_name() with ngx_get_full_name().

The ngx_get_full_name() function takes more readable arguments list.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 4cc80826e..9cabac1e6 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -897,7 +897,9 @@ ngx_process_options(ngx_cycle_t *cycle)
         ngx_str_set(&cycle->conf_file, NGX_CONF_PATH);
     }
 
-    if (ngx_conf_full_name(cycle, &cycle->conf_file, 0) != NGX_OK) {
+    if (ngx_get_full_name(cycle->pool, &cycle->prefix, &cycle->conf_file)
+        != NGX_OK)
+    {
         return NGX_ERROR;
     }
 
@@ -1013,7 +1015,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
         ngx_str_set(&ccf->pid, NGX_PID_PATH);
     }
 
-    if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) {
+    if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->pid) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
@@ -1061,7 +1063,9 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
         ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH);
     }
 
-    if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) {
+    if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->lock_file)
+        != NGX_OK)
+    {
         return NGX_CONF_ERROR;
     }