Mercurial > hg > nginx

diff src/core/ngx_conf_file.c @ 5317:f1a91825730a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced ngx_conf_full_name() with ngx_get_full_name(). The ngx_get_full_name() function takes more readable arguments list.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 06 Aug 2013 19:58:40 +0400
parents 12dd27b74117
children 7094bd12c1ff
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -747,7 +747,7 @@ ngx_conf_include(ngx_conf_t *cf, ngx_com
 
     ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
 
-    if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
+    if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
@@ -822,7 +822,7 @@ ngx_conf_open_file(ngx_cycle_t *cycle, n
     if (name->len) {
         full = *name;
 
-        if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) {
+        if (ngx_get_full_name(cycle->pool, &cycle->prefix, &full) != NGX_OK) {
             return NULL;
         }