diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-07-03 17:30:15 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-07-03 17:30:15 +0400 |
| commit | aeb8d713f43b8304521629343aa9feb5cd0feae3 (patch) | |
| tree | 0949f2236656588423dfdea0655bd5133ba1fe93 /strings | |
| parent | 9ad8ff666c4876de270f80f180b42eceac76b6f0 (diff) | |
| download | mariadb-git-aeb8d713f43b8304521629343aa9feb5cd0feae3.tar.gz | |
Removing unused code in ctype-utf8.c
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-utf8.c | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index ccb69157b73..cecbe53f26f 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -4885,66 +4885,6 @@ static int my_utf8_uni(CHARSET_INFO *cs __attribute__((unused)), *pwc= UTF8MB3_CODE(c, s[1], s[2]); return 3; } -#ifdef UNICODE_32BIT - else if (c < 0xf8 && sizeof(my_wc_t)*8 >= 32) - { - if (s+4 > e) /* We need 4 characters */ - return MY_CS_TOOSMALL4; - - if (!(IS_CONTINUATION_BYTE(s[1]) && - IS_CONTINUATION_BYTE(s[2]) && - IS_CONTINUATION_BYTE(s[3]) && - (c >= 0xf1 || s[1] >= 0x90))) - return MY_CS_ILSEQ; - - *pwc = ((my_wc_t) (c & 0x07) << 18) | - ((my_wc_t) (s[1] ^ 0x80) << 12) | - ((my_wc_t) (s[2] ^ 0x80) << 6) | - (my_wc_t) (s[3] ^ 0x80); - - return 4; - } - else if (c < 0xfc && sizeof(my_wc_t)*8 >= 32) - { - if (s+5 >e) /* We need 5 characters */ - return MY_CS_TOOSMALL5; - - if (!(IS_CONTINUATION_BYTE(s[1]) && - IS_CONTINUATION_BYTE(s[2]) && - IS_CONTINUATION_BYTE(s[3]) && - IS_CONTINUATION_BYTE(s[4]) && - (c >= 0xf9 || s[1] >= 0x88))) - return MY_CS_ILSEQ; - - *pwc = ((my_wc_t) (c & 0x03) << 24) | - ((my_wc_t) (s[1] ^ 0x80) << 18) | - ((my_wc_t) (s[2] ^ 0x80) << 12) | - ((my_wc_t) (s[3] ^ 0x80) << 6) | - (my_wc_t) (s[4] ^ 0x80); - return 5; - } - else if (c < 0xfe && sizeof(my_wc_t)*8 >= 32) - { - if ( s+6 >e ) /* We need 6 characters */ - return MY_CS_TOOSMALL6; - - if (!(IS_CONTINUATION_BYTE(s[1]) && - IS_CONTINUATION_BYTE(s[2]) && - IS_CONTINUATION_BYTE(s[3]) && - IS_CONTINUATION_BYTE(s[4]) && - IS_CONTINUATION_BYTE(s[5]) && - (c >= 0xfd || s[1] >= 0x84))) - return MY_CS_ILSEQ; - - *pwc = ((my_wc_t) (c & 0x01) << 30) - | ((my_wc_t) (s[1] ^ 0x80) << 24) - | ((my_wc_t) (s[2] ^ 0x80) << 18) - | ((my_wc_t) (s[3] ^ 0x80) << 12) - | ((my_wc_t) (s[4] ^ 0x80) << 6) - | (my_wc_t) (s[5] ^ 0x80); - return 6; - } -#endif return MY_CS_ILSEQ; } @@ -5330,50 +5270,6 @@ int my_charlen_utf8(CHARSET_INFO *cs __attribute__((unused)), if (c < 0xf0) return my_valid_mbcharlen_utf8mb3(s, e); -#ifdef UNICODE_32BIT - if (c < 0xf8 && sizeof(my_wc_t)*8 >= 32) - { - if (s+4 > e) /* We need 4 characters */ - return MY_CS_TOOSMALL4; - - if (!(IS_CONTINUATION_BYTE(s[1]) && - IS_CONTINUATION_BYTE(s[2]) && - IS_CONTINUATION_BYTE(s[3]) && - (c >= 0xf1 || s[1] >= 0x90))) - return MY_CS_ILSEQ; - - return 4; - } - if (c < 0xfc && sizeof(my_wc_t)*8 >= 32) - { - if (s+5 >e) /* We need 5 characters */ - return MY_CS_TOOSMALL5; - - if (!(IS_CONTINUATION_BYTE(s[1]) && - IS_CONTINUATION_BYTE(s[2]) && - IS_CONTINUATION_BYTE(s[3]) && - IS_CONTINUATION_BYTE(s[4]) && - (c >= 0xf9 || s[1] >= 0x88))) - return MY_CS_ILSEQ; - - return 5; - } - if (c < 0xfe && sizeof(my_wc_t)*8 >= 32) - { - if ( s+6 >e ) /* We need 6 characters */ - return MY_CS_TOOSMALL6; - - if (!(IS_CONTINUATION_BYTE(s[1]) && - IS_CONTINUATION_BYTE(s[2]) && - IS_CONTINUATION_BYTE(s[3]) && - IS_CONTINUATION_BYTE(s[4]) && - IS_CONTINUATION_BYTE(s[5]) && - (c >= 0xfd || s[1] >= 0x84))) - return MY_CS_ILSEQ; - - return 6; - } -#endif return MY_CS_ILSEQ; } @@ -5495,14 +5391,6 @@ static uint my_mbcharlen_utf8(CHARSET_INFO *cs __attribute__((unused)), return 2; else if (c < 0xf0) return 3; -#ifdef UNICODE_32BIT - else if (c < 0xf8) - return 4; - else if (c < 0xfc) - return 5; - else if (c < 0xfe) - return 6; -#endif return 0; /* Illegal mb head */; } |