Klaus Demo nginx / f10b4e0
merge r2920, r2934, r3116, r3119: style fixes Igor Sysoev 12 years ago
6 changed file(s) with 25 addition(s) and 22 deletion(s). Raw diff Collapse all Expand all
533533
534534 next_name->key.len = names[n].key.len - len;
535535 next_name->key.data = names[n].key.data + len;
536 next_name->key_hash= 0;
536 next_name->key_hash = 0;
537537 next_name->value = names[n].value;
538538
539539 #if 0
561561
562562 next_name->key.len = names[i].key.len - dot_len;
563563 next_name->key.data = names[i].key.data + dot_len;
564 next_name->key_hash= 0;
564 next_name->key_hash = 0;
565565 next_name->value = names[i].value;
566566
567567 #if 0
2929 return dst;
3030 }
3131
32 for ( /* void */ ; --n; dst++, src++) {
32 while (--n) {
3333 *dst = *src;
3434
3535 if (*dst == '\0') {
3636 return dst;
3737 }
38
39 dst++;
40 src++;
3841 }
3942
4043 *dst = '\0';
564567 c1 = (ngx_uint_t) *s1++;
565568 c2 = (ngx_uint_t) *s2++;
566569
567 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
568 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
570 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
571 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
569572
570573 if (c1 == c2) {
571574
590593 c1 = (ngx_uint_t) *s1++;
591594 c2 = (ngx_uint_t) *s2++;
592595
593 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
594 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
596 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
597 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
595598
596599 if (c1 == c2) {
597600
679682 ngx_uint_t c1, c2;
680683
681684 c2 = (ngx_uint_t) *s2++;
682 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
685 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
683686
684687 do {
685688 do {
689692 return NULL;
690693 }
691694
692 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
695 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
693696
694697 } while (c1 != c2);
695698
711714 ngx_uint_t c1, c2;
712715
713716 c2 = (ngx_uint_t) *s2++;
714 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
717 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
715718 last -= n;
716719
717720 do {
722725
723726 c1 = (ngx_uint_t) *s1++;
724727
725 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
728 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1;
726729
727730 } while (c1 != c2);
728731
13361339
13371340 /* find the number of the characters to be escaped */
13381341
1339 n = 0;
1342 n = 0;
13401343
13411344 for (i = 0; i < size; i++) {
13421345 if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
863863
864864 /* rc == NGX_BUSY */
865865
866 old = (ngx_http_variable_value_t *)
866 old = (ngx_http_variable_value_t *)
867867 ngx_radix32tree_find(ctx->tree, cidr.u.in.addr & cidr.u.in.mask);
868868
869869 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
675675
676676 /* find the number of the characters to be escaped */
677677
678 n = 0;
678 n = 0;
679679
680680 for (i = 0; i < size; i++) {
681681 if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
403403 sax->endElementNs = ngx_http_xslt_sax_end_element;
404404
405405 sax->characters = ngx_http_xslt_sax_characters;
406 sax->ignorableWhitespace = ngx_http_xslt_sax_characters;
406 sax->ignorableWhitespace = ngx_http_xslt_sax_characters;
407407 sax->cdataBlock = ngx_http_xslt_sax_cdata_block;
408408 sax->getEntity = ngx_http_xslt_sax_get_entity;
409409 sax->resolveEntity = ngx_http_xslt_sax_resolve_entity;
1717
1818
1919 typedef struct {
20 DIR *dir;
21 struct dirent *de;
22 struct stat info;
23
24 unsigned type:8;
25 unsigned valid_info:1;
26 unsigned valid_type:1;
20 DIR *dir;
21 struct dirent *de;
22 struct stat info;
23
24 unsigned type:8;
25 unsigned valid_info:1;
26 unsigned valid_type:1;
2727 } ngx_dir_t;
2828
2929