Mercurial > hg > nginx
diff src/core/nginx.c @ 5317:f1a91825730a
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 | e088695737c3 |
children | 314c3d7cc3a5 |
line wrap: on
line diff
--- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -897,7 +897,9 @@ ngx_process_options(ngx_cycle_t *cycle) ngx_str_set(&cycle->conf_file, NGX_CONF_PATH); } - if (ngx_conf_full_name(cycle, &cycle->conf_file, 0) != NGX_OK) { + if (ngx_get_full_name(cycle->pool, &cycle->prefix, &cycle->conf_file) + != NGX_OK) + { return NGX_ERROR; } @@ -1013,7 +1015,7 @@ ngx_core_module_init_conf(ngx_cycle_t *c ngx_str_set(&ccf->pid, NGX_PID_PATH); } - if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) { + if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->pid) != NGX_OK) { return NGX_CONF_ERROR; } @@ -1061,7 +1063,9 @@ ngx_core_module_init_conf(ngx_cycle_t *c ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH); } - if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) { + if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->lock_file) + != NGX_OK) + { return NGX_CONF_ERROR; }