aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_file.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/ngx_file.c')
-rw-r--r--src/core/ngx_file.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 049b8767c..28e8871ec 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -355,9 +355,7 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
path->name.len--;
}
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &path->name)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
return NULL;
}
@@ -411,9 +409,7 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev,
(*path)->name = init->name;
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &(*path)->name)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}