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

style fix

Browse Source
This commit is contained in:
Igor Sysoev 2008-08-04 20:25:51 +00:00
parent 2b29a703bb
commit b47aed9005
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/http/modules/ngx_http_xslt_filter_module.c
View File

@ -36,8 +36,8 @@ typedef struct {
typedef struct { typedef struct {
xmlDtdPtr dtd; xmlDtdPtr dtd;
ngx_array_t sheets; /* ngx_http_xslt_sheet_t */ ngx_array_t sheets; /* ngx_http_xslt_sheet_t */
ngx_hash_t types_hash; ngx_hash_t types;
ngx_array_t *keys; ngx_array_t *types_keys;
} ngx_http_xslt_filter_conf_t; } ngx_http_xslt_filter_conf_t;
@ -148,7 +148,7 @@ static ngx_command_t ngx_http_xslt_filter_commands[] = {
NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_1MORE, NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_1MORE,
ngx_http_types_slot, ngx_http_types_slot,
NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_xslt_filter_conf_t, keys), offsetof(ngx_http_xslt_filter_conf_t, types_keys),
&ngx_http_xslt_default_types[0] }, &ngx_http_xslt_default_types[0] },
ngx_null_command ngx_null_command
@ -206,7 +206,7 @@ ngx_http_xslt_header_filter(ngx_http_request_t *r)
conf = ngx_http_get_module_loc_conf(r, ngx_http_xslt_filter_module); conf = ngx_http_get_module_loc_conf(r, ngx_http_xslt_filter_module);
if (conf->sheets.nelts == 0 if (conf->sheets.nelts == 0
|| ngx_http_test_content_type(r, &conf->types_hash) == NULL) || ngx_http_test_content_type(r, &conf->types) == NULL)
{ {
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }
@ -1053,8 +1053,10 @@ ngx_http_xslt_filter_create_conf(ngx_conf_t *cf)
/* /*
* set by ngx_pcalloc(): * set by ngx_pcalloc():
* *
* conf->dtd * conf->dtd = NULL;
* conf->sheets * conf->sheets = { NULL };
* conf->types = { NULL };
* conf->types_keys = NULL;
*/ */
return conf; return conf;
@ -1075,8 +1077,9 @@ ngx_http_xslt_filter_merge_conf(ngx_conf_t *cf, void *parent, void *child)
conf->sheets = prev->sheets; conf->sheets = prev->sheets;
} }
if (ngx_http_merge_types(cf, conf->keys, &conf->types_hash, prev->keys, if (ngx_http_merge_types(cf, conf->types_keys, &conf->types,
&prev->types_hash, ngx_http_xslt_default_types) prev->types_keys, &prev->types,
ngx_http_xslt_default_types)
!= NGX_OK) != NGX_OK)
{ {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;