Mercurial > hg > nginx
diff src/core/ngx_file.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 | 12dd27b74117 |
children | 314c3d7cc3a5 |
line wrap: on
line diff
--- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -355,7 +355,9 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, n path->name.len--; } - if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &path->name) + != NGX_OK) + { return NULL; } @@ -409,7 +411,9 @@ ngx_conf_merge_path_value(ngx_conf_t *cf (*path)->name = init->name; - if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &(*path)->name) + != NGX_OK) + { return NGX_CONF_ERROR; }