Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_charset_filter_module.c @ 2125:8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 29 Jul 2008 14:41:34 +0000 |
parents | c0bafb136d7b |
children | 2cdefc40cabd |
comparison
equal
deleted
inserted
replaced
2124:e0b424b98f24 | 2125:8e4b9d2acde8 |
---|---|
640 out->next = NULL; | 640 out->next = NULL; |
641 | 641 |
642 size = buf->last - src; | 642 size = buf->last - src; |
643 | 643 |
644 saved = src; | 644 saved = src; |
645 n = ngx_utf_decode(&saved, size); | 645 n = ngx_utf8_decode(&saved, size); |
646 | 646 |
647 if (n == 0xfffffffe) { | 647 if (n == 0xfffffffe) { |
648 /* incomplete UTF-8 symbol */ | 648 /* incomplete UTF-8 symbol */ |
649 | 649 |
650 ngx_memcpy(ctx->saved, src, size); | 650 ngx_memcpy(ctx->saved, src, size); |
708 break; | 708 break; |
709 } | 709 } |
710 } | 710 } |
711 | 711 |
712 saved = ctx->saved; | 712 saved = ctx->saved; |
713 n = ngx_utf_decode(&saved, i); | 713 n = ngx_utf8_decode(&saved, i); |
714 | 714 |
715 c = '\0'; | 715 c = '\0'; |
716 | 716 |
717 if (n < 0x10000) { | 717 if (n < 0x10000) { |
718 table = (u_char **) ctx->table; | 718 table = (u_char **) ctx->table; |
816 continue; | 816 continue; |
817 } | 817 } |
818 | 818 |
819 len = buf->last - src; | 819 len = buf->last - src; |
820 | 820 |
821 n = ngx_utf_decode(&src, len); | 821 n = ngx_utf8_decode(&src, len); |
822 | 822 |
823 if (n < 0x10000) { | 823 if (n < 0x10000) { |
824 | 824 |
825 p = table[n >> 8]; | 825 p = table[n >> 8]; |
826 | 826 |
1268 ctx->charset->length += i; | 1268 ctx->charset->length += i; |
1269 ctx->characters++; | 1269 ctx->characters++; |
1270 | 1270 |
1271 p = &table->src2dst[src * NGX_UTF_LEN] + 1; | 1271 p = &table->src2dst[src * NGX_UTF_LEN] + 1; |
1272 | 1272 |
1273 n = ngx_utf_decode(&p, i); | 1273 n = ngx_utf8_decode(&p, i); |
1274 | 1274 |
1275 if (n > 0xffff) { | 1275 if (n > 0xffff) { |
1276 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1276 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1277 "invalid value \"%V\"", &value[1]); | 1277 "invalid value \"%V\"", &value[1]); |
1278 return NGX_CONF_ERROR; | 1278 return NGX_CONF_ERROR; |