From 74dfd08957279720873bd89fe6b3d1a78a61cc0c Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Tue, 6 Aug 2013 19:58:40 +0400 Subject: [PATCH] API change: removed the ngx_conf_full_name() function. The ngx_get_full_name() should be used instead. --- src/core/ngx_conf_file.c | 10 ---------- src/core/ngx_conf_file.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 38483428e..afa27d76c 100644 --- 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_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) -{ - 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) { diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index d73a6c8bf..f0a12d41f 100644 --- 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_str_t *filename); 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, ...);