From e3cab7675801d224d1d5cdbe7f7b76bbaed97c91 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Tue, 20 Aug 2013 21:11:19 +0400 Subject: Backed out f1a91825730a and 7094bd12c1ff. While ngx_get_full_name() might have a bit more descriptive arguments, the ngx_conf_full_name() is generally easier to use when parsing configuration and limits exposure of cycle->prefix / cycle->conf_prefix details. --- src/core/ngx_file.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/core/ngx_file.c') 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; } -- cgit