Mercurial > hg > nginx
comparison src/core/ngx_conf_file.c @ 5331:e04083b79335
Style improved after 12dd27b74117.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 20 Aug 2013 21:33:43 +0400 |
parents | 314c3d7cc3a5 |
children | 56ad171c3dd1 |
comparison
equal
deleted
inserted
replaced
5330:314c3d7cc3a5 | 5331:e04083b79335 |
---|---|
798 | 798 |
799 | 799 |
800 ngx_int_t | 800 ngx_int_t |
801 ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix) | 801 ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix) |
802 { | 802 { |
803 return ngx_get_full_name(cycle->pool, | 803 ngx_str_t *prefix; |
804 conf_prefix ? &cycle->conf_prefix: | 804 |
805 &cycle->prefix, | 805 prefix = conf_prefix ? &cycle->conf_prefix : &cycle->prefix; |
806 name); | 806 |
807 return ngx_get_full_name(cycle->pool, prefix, name); | |
807 } | 808 } |
808 | 809 |
809 | 810 |
810 ngx_open_file_t * | 811 ngx_open_file_t * |
811 ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) | 812 ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) |