aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_file.c
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2013-08-06 19:58:40 +0400
committerValentin Bartenev <vbart@nginx.com>2013-08-06 19:58:40 +0400
commitd29d21bade3a0fbe0e2d5d7e0e5546873c2ee588 (patch)
tree26c5b0dc0e449c36f3df7a46d070a9e805c287ee /src/core/ngx_file.c
parent3c5bd34771be032ef14e59f934058b3dce93588b (diff)
downloadnginx-d29d21bade3a0fbe0e2d5d7e0e5546873c2ee588.tar.gz
nginx-d29d21bade3a0fbe0e2d5d7e0e5546873c2ee588.zip
Replaced ngx_conf_full_name() with ngx_get_full_name().
The ngx_get_full_name() function takes more readable arguments list.
Diffstat (limited to 'src/core/ngx_file.c')
-rw-r--r--src/core/ngx_file.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 28e8871ec..049b8767c 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -355,7 +355,9 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
path->name.len--;
}
- if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
+ if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &path->name)
+ != NGX_OK)
+ {
return NULL;
}
@@ -409,7 +411,9 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev,
(*path)->name = init->name;
- if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) {
+ if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &(*path)->name)
+ != NGX_OK)
+ {
return NGX_CONF_ERROR;
}