This commit is contained in:
Maxim Dounin 2017-08-10 22:21:20 +03:00
parent b986b4314b
commit 0f841fcdee
3 changed files with 7 additions and 7 deletions

View File

@ -262,7 +262,7 @@ ngx_pcre_free_studies(void *data)
part = &studies->part; part = &studies->part;
elts = part->elts; elts = part->elts;
for (i = 0 ; /* void */ ; i++) { for (i = 0; /* void */ ; i++) {
if (i >= part->nelts) { if (i >= part->nelts) {
if (part->next == NULL) { if (part->next == NULL) {
@ -326,7 +326,7 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
part = &ngx_pcre_studies->part; part = &ngx_pcre_studies->part;
elts = part->elts; elts = part->elts;
for (i = 0 ; /* void */ ; i++) { for (i = 0; /* void */ ; i++) {
if (i >= part->nelts) { if (i >= part->nelts) {
if (part->next == NULL) { if (part->next == NULL) {

View File

@ -819,7 +819,7 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
key = e.pos; key = e.pos;
#endif #endif
code = *(ngx_http_script_code_pt *) e.ip; code = *(ngx_http_script_code_pt *) e.ip;
code((ngx_http_script_engine_t *) & e); code((ngx_http_script_engine_t *) &e);
#if (NGX_DEBUG) #if (NGX_DEBUG)
val = e.pos; val = e.pos;

View File

@ -865,7 +865,7 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
lcode = *(ngx_http_script_len_code_pt *) le.ip; lcode = *(ngx_http_script_len_code_pt *) le.ip;
skip_empty = lcode(&le); skip_empty = lcode(&le);
for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode (&le)) { for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) {
lcode = *(ngx_http_script_len_code_pt *) le.ip; lcode = *(ngx_http_script_len_code_pt *) le.ip;
} }
le.ip += sizeof(uintptr_t); le.ip += sizeof(uintptr_t);
@ -990,7 +990,7 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
while (*(uintptr_t *) le.ip) { while (*(uintptr_t *) le.ip) {
lcode = *(ngx_http_script_len_code_pt *) le.ip; lcode = *(ngx_http_script_len_code_pt *) le.ip;
key_len = (u_char) lcode (&le); key_len = (u_char) lcode(&le);
lcode = *(ngx_http_script_len_code_pt *) le.ip; lcode = *(ngx_http_script_len_code_pt *) le.ip;
skip_empty = lcode(&le); skip_empty = lcode(&le);
@ -1018,14 +1018,14 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
*e.pos++ = (u_char) ((key_len >> 8) & 0xff); *e.pos++ = (u_char) ((key_len >> 8) & 0xff);
code = *(ngx_http_script_code_pt *) e.ip; code = *(ngx_http_script_code_pt *) e.ip;
code((ngx_http_script_engine_t *) & e); code((ngx_http_script_engine_t *) &e);
*e.pos++ = (u_char) (val_len & 0xff); *e.pos++ = (u_char) (val_len & 0xff);
*e.pos++ = (u_char) ((val_len >> 8) & 0xff); *e.pos++ = (u_char) ((val_len >> 8) & 0xff);
while (*(uintptr_t *) e.ip) { while (*(uintptr_t *) e.ip) {
code = *(ngx_http_script_code_pt *) e.ip; code = *(ngx_http_script_code_pt *) e.ip;
code((ngx_http_script_engine_t *) & e); code((ngx_http_script_engine_t *) &e);
} }
e.ip += sizeof(uintptr_t); e.ip += sizeof(uintptr_t);