Mercurial > hg > nginx
changeset 5318:7094bd12c1ff
API change: removed the ngx_conf_full_name() function.
The ngx_get_full_name() should be used instead.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Tue, 06 Aug 2013 19:58:40 +0400 |
| parents | f1a91825730a |
| children | 50f531a55b73 |
| files | src/core/ngx_conf_file.c src/core/ngx_conf_file.h |
| diffstat | 2 files changed, 0 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -797,16 +797,6 @@ ngx_conf_include(ngx_conf_t *cf, ngx_com } -ngx_int_t -ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix) -{ - return ngx_get_full_name(cycle->pool, - conf_prefix ? &cycle->conf_prefix: - &cycle->prefix, - name); -} - - ngx_open_file_t * ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) {
--- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -311,8 +311,6 @@ char *ngx_conf_parse(ngx_conf_t *cf, ngx char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); -ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, - ngx_uint_t conf_prefix); ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name); void ngx_cdecl ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, ngx_err_t err, const char *fmt, ...);