Mercurial > hg > nginx
comparison src/http/ngx_http_script.c @ 5317:f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
The ngx_get_full_name() function takes more readable arguments list.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Tue, 06 Aug 2013 19:58:40 +0400 |
parents | 12dd27b74117 |
children | 314c3d7cc3a5 |
comparison
equal
deleted
inserted
replaced
5316:12dd27b74117 | 5317:f1a91825730a |
---|---|
129 } | 129 } |
130 | 130 |
131 if ((v->len == 0 || v->data[0] != '$') | 131 if ((v->len == 0 || v->data[0] != '$') |
132 && (ccv->conf_prefix || ccv->root_prefix)) | 132 && (ccv->conf_prefix || ccv->root_prefix)) |
133 { | 133 { |
134 if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) { | 134 if (ngx_get_full_name(ccv->cf->pool, |
135 ccv->conf_prefix ? &ccv->cf->cycle->conf_prefix: | |
136 &ccv->cf->cycle->prefix, | |
137 v) | |
138 != NGX_OK) | |
139 { | |
135 return NGX_ERROR; | 140 return NGX_ERROR; |
136 } | 141 } |
137 | 142 |
138 ccv->conf_prefix = 0; | 143 ccv->conf_prefix = 0; |
139 ccv->root_prefix = 0; | 144 ccv->root_prefix = 0; |