Mercurial > hg > nginx-quic
comparison src/core/ngx_conf_file.h @ 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 | 7094bd12c1ff |
children | 1b7e246e6b38 |
comparison
equal
deleted
inserted
replaced
5329:00bdc9f08a16 | 5330:314c3d7cc3a5 |
---|---|
309 char *ngx_conf_param(ngx_conf_t *cf); | 309 char *ngx_conf_param(ngx_conf_t *cf); |
310 char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename); | 310 char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename); |
311 char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 311 char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
312 | 312 |
313 | 313 |
314 ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, | |
315 ngx_uint_t conf_prefix); | |
314 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name); | 316 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name); |
315 void ngx_cdecl ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, | 317 void ngx_cdecl ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, |
316 ngx_err_t err, const char *fmt, ...); | 318 ngx_err_t err, const char *fmt, ...); |
317 | 319 |
318 | 320 |