mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 21:52:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style improved after 12dd27b74117.

Browse Source
This commit is contained in:
Maxim Dounin 2013-08-20 21:33:43 +04:00
parent e3cab76758
commit 92f0126269
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/ngx_conf_file.c
View File

@ -800,10 +800,11 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_int_t ngx_int_t
ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix) ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix)
{ {
return ngx_get_full_name(cycle->pool, ngx_str_t *prefix;
conf_prefix ? &cycle->conf_prefix:
&cycle->prefix, prefix = conf_prefix ? &cycle->conf_prefix : &cycle->prefix;
name);
return ngx_get_full_name(cycle->pool, prefix, name);
} }

13
src/http/ngx_http_script.c
View File

@ -1327,20 +1327,17 @@ ngx_http_script_full_name_code(ngx_http_script_engine_t *e)
{ {
ngx_http_script_full_name_code_t *code; ngx_http_script_full_name_code_t *code;
ngx_str_t value; ngx_str_t value, *prefix;
code = (ngx_http_script_full_name_code_t *) e->ip; code = (ngx_http_script_full_name_code_t *) e->ip;
value.data = e->buf.data; value.data = e->buf.data;
value.len = e->pos - e->buf.data; value.len = e->pos - e->buf.data;
if (ngx_get_full_name(e->request->pool, prefix = code->conf_prefix ? (ngx_str_t *) &ngx_cycle->conf_prefix:
code->conf_prefix (ngx_str_t *) &ngx_cycle->prefix;
? (ngx_str_t *) &ngx_cycle->conf_prefix:
(ngx_str_t *) &ngx_cycle->prefix, if (ngx_get_full_name(e->request->pool, prefix, &value) != NGX_OK) {
&value)
!= NGX_OK)
{
e->ip = ngx_http_script_exit; e->ip = ngx_http_script_exit;
e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
return; return;