Mercurial > hg > nginx
comparison src/core/ngx_conf_file.c @ 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 | 314c3d7cc3a5 |
comparison
equal
deleted
inserted
replaced
5317:f1a91825730a | 5318:7094bd12c1ff |
---|---|
795 | 795 |
796 return rv; | 796 return rv; |
797 } | 797 } |
798 | 798 |
799 | 799 |
800 ngx_int_t | |
801 ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix) | |
802 { | |
803 return ngx_get_full_name(cycle->pool, | |
804 conf_prefix ? &cycle->conf_prefix: | |
805 &cycle->prefix, | |
806 name); | |
807 } | |
808 | |
809 | |
810 ngx_open_file_t * | 800 ngx_open_file_t * |
811 ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) | 801 ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) |
812 { | 802 { |
813 ngx_str_t full; | 803 ngx_str_t full; |
814 ngx_uint_t i; | 804 ngx_uint_t i; |