diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2013-08-06 19:58:40 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2013-08-06 19:58:40 +0400 |
| commit | d29d21bade3a0fbe0e2d5d7e0e5546873c2ee588 (patch) | |
| tree | 26c5b0dc0e449c36f3df7a46d070a9e805c287ee /src/core/ngx_conf_file.c | |
| parent | 3c5bd34771be032ef14e59f934058b3dce93588b (diff) | |
| download | nginx-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_conf_file.c')
| -rw-r--r-- | src/core/ngx_conf_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 6cfb5d58d..38483428e 100644 --- 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_command_t *cmd, void *conf) 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, ngx_str_t *name) 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; } |