diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-20 21:11:19 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-20 21:11:19 +0400 |
| commit | e3cab7675801d224d1d5cdbe7f7b76bbaed97c91 (patch) | |
| tree | 4d26e1efc552059730fa76391c9e9834d8e38cbe /src/core/ngx_conf_file.h | |
| parent | 4c53a38fb59496e8280991b307a5fdfbd7f71040 (diff) | |
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.
Diffstat (limited to 'src/core/ngx_conf_file.h')
| -rw-r--r-- | src/core/ngx_conf_file.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index f0a12d41f..d73a6c8bf 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -311,6 +311,8 @@ 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, ...); |