Mercurial > hg > nginx

diff src/core/ngx_file.c @ 5330:314c3d7cc3a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Aug 2013 21:11:19 +0400
parents f1a91825730a
children 7d8770196436
line wrap: on
line diff
--- 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, n
         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
 
     (*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;
     }