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