diff options
-rw-r--r-- | include/m_ctype.h | 2 | ||||
-rw-r--r-- | strings/ctype-big5.c | 8 | ||||
-rw-r--r-- | strings/ctype-cp932.c | 16 | ||||
-rw-r--r-- | strings/ctype-euc_kr.c | 14 | ||||
-rw-r--r-- | strings/ctype-eucjpms.c | 26 | ||||
-rw-r--r-- | strings/ctype-gb2312.c | 12 | ||||
-rw-r--r-- | strings/ctype-gbk.c | 10 | ||||
-rw-r--r-- | strings/ctype-mb.c | 6 | ||||
-rw-r--r-- | strings/ctype-sjis.c | 10 | ||||
-rw-r--r-- | strings/ctype-ujis.c | 26 |
10 files changed, 65 insertions, 65 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 554a7de8e56..708107ff120 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -96,7 +96,7 @@ typedef struct casefold_info_char_t struct casefold_info_st { my_wc_t maxchar; - MY_CASEFOLD_CHARACTER **page; + const MY_CASEFOLD_CHARACTER * const *page; }; diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index c644a74ceb6..ef01b45aec0 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -187,7 +187,7 @@ static const uchar sort_order_big5[]= }; -static MY_CASEFOLD_CHARACTER cA2[256]= +static const MY_CASEFOLD_CHARACTER cA2[256]= { /* A200-A20F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -380,7 +380,7 @@ static MY_CASEFOLD_CHARACTER cA2[256]= }; -static MY_CASEFOLD_CHARACTER cA3[256]= +static const MY_CASEFOLD_CHARACTER cA3[256]= { /* A300-A30F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -573,7 +573,7 @@ static MY_CASEFOLD_CHARACTER cA3[256]= }; -static MY_CASEFOLD_CHARACTER cC7[256]= +static const MY_CASEFOLD_CHARACTER cC7[256]= { /* C700-C70F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -766,7 +766,7 @@ static MY_CASEFOLD_CHARACTER cC7[256]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_big5[256]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_big5[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c index dfc7621b89d..0f1e8457072 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -197,7 +197,7 @@ static const uchar sort_order_cp932[]= #define cp932code(c,d) ((((uint) (uchar)(c)) << 8) | (uint) (uchar) (d)) -static MY_CASEFOLD_CHARACTER c81[256]= +static const MY_CASEFOLD_CHARACTER c81[256]= { /* 8100-810F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -407,7 +407,7 @@ static MY_CASEFOLD_CHARACTER c81[256]= }; -static MY_CASEFOLD_CHARACTER c82[256]= +static const MY_CASEFOLD_CHARACTER c82[256]= { /* 8200-820F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -615,7 +615,7 @@ static MY_CASEFOLD_CHARACTER c82[256]= }; -static MY_CASEFOLD_CHARACTER c83[256]= +static const MY_CASEFOLD_CHARACTER c83[256]= { /* 8300-830F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -825,7 +825,7 @@ static MY_CASEFOLD_CHARACTER c83[256]= }; -static MY_CASEFOLD_CHARACTER c84[256]= +static const MY_CASEFOLD_CHARACTER c84[256]= { /* 8400-840F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1035,7 +1035,7 @@ static MY_CASEFOLD_CHARACTER c84[256]= }; -static MY_CASEFOLD_CHARACTER c87[256]= +static const MY_CASEFOLD_CHARACTER c87[256]= { /* 8700-870F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1245,7 +1245,7 @@ static MY_CASEFOLD_CHARACTER c87[256]= }; -static MY_CASEFOLD_CHARACTER cEE[256]= +static const MY_CASEFOLD_CHARACTER cEE[256]= { /* EE00-EE0F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1456,7 +1456,7 @@ static MY_CASEFOLD_CHARACTER cEE[256]= }; -static MY_CASEFOLD_CHARACTER cFA[256]= +static const MY_CASEFOLD_CHARACTER cFA[256]= { /* FA00-FA0F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1666,7 +1666,7 @@ static MY_CASEFOLD_CHARACTER cFA[256]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_cp932[256]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_cp932[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index 583919330c9..ab27074f20d 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -213,7 +213,7 @@ static const uchar sort_order_euc_kr[]= #include "ctype-mb.inl" -static MY_CASEFOLD_CHARACTER cA3[256]= +static const MY_CASEFOLD_CHARACTER cA3[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -418,7 +418,7 @@ static MY_CASEFOLD_CHARACTER cA3[256]= }; -static MY_CASEFOLD_CHARACTER cA5[256]= +static const MY_CASEFOLD_CHARACTER cA5[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -623,7 +623,7 @@ static MY_CASEFOLD_CHARACTER cA5[256]= }; -static MY_CASEFOLD_CHARACTER cA7[256]= +static const MY_CASEFOLD_CHARACTER cA7[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -828,7 +828,7 @@ static MY_CASEFOLD_CHARACTER cA7[256]= }; -static MY_CASEFOLD_CHARACTER cA8[256]= +static const MY_CASEFOLD_CHARACTER cA8[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1033,7 +1033,7 @@ static MY_CASEFOLD_CHARACTER cA8[256]= }; -static MY_CASEFOLD_CHARACTER cA9[256]= +static const MY_CASEFOLD_CHARACTER cA9[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1238,7 +1238,7 @@ static MY_CASEFOLD_CHARACTER cA9[256]= }; -static MY_CASEFOLD_CHARACTER cAC[256]= +static const MY_CASEFOLD_CHARACTER cAC[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1443,7 +1443,7 @@ static MY_CASEFOLD_CHARACTER cAC[256]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_euckr[256]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_euckr[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c index f784ca8720f..1812c74d465 100644 --- a/strings/ctype-eucjpms.c +++ b/strings/ctype-eucjpms.c @@ -250,7 +250,7 @@ static const uchar sort_order_eucjpms[]= /* Case info pages for JIS-X-0208 range */ -static MY_CASEFOLD_CHARACTER cA2[256]= +static const MY_CASEFOLD_CHARACTER cA2[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -371,7 +371,7 @@ static MY_CASEFOLD_CHARACTER cA2[256]= }; -static MY_CASEFOLD_CHARACTER cA3[256]= +static const MY_CASEFOLD_CHARACTER cA3[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -492,7 +492,7 @@ static MY_CASEFOLD_CHARACTER cA3[256]= }; -static MY_CASEFOLD_CHARACTER cA6[256]= +static const MY_CASEFOLD_CHARACTER cA6[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -613,7 +613,7 @@ static MY_CASEFOLD_CHARACTER cA6[256]= }; -static MY_CASEFOLD_CHARACTER cA7[256]= +static const MY_CASEFOLD_CHARACTER cA7[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -734,7 +734,7 @@ static MY_CASEFOLD_CHARACTER cA7[256]= }; -static MY_CASEFOLD_CHARACTER cAD[256]= +static const MY_CASEFOLD_CHARACTER cAD[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -857,7 +857,7 @@ static MY_CASEFOLD_CHARACTER cAD[256]= /* Case info pages for JIS-X-0212 range */ -static MY_CASEFOLD_CHARACTER c8FA6[256]= +static const MY_CASEFOLD_CHARACTER c8FA6[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -978,7 +978,7 @@ static MY_CASEFOLD_CHARACTER c8FA6[256]= }; -static MY_CASEFOLD_CHARACTER c8FA7[256]= +static const MY_CASEFOLD_CHARACTER c8FA7[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1099,7 +1099,7 @@ static MY_CASEFOLD_CHARACTER c8FA7[256]= }; -static MY_CASEFOLD_CHARACTER c8FA9[256]= +static const MY_CASEFOLD_CHARACTER c8FA9[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1220,7 +1220,7 @@ static MY_CASEFOLD_CHARACTER c8FA9[256]= }; -static MY_CASEFOLD_CHARACTER c8FAA[256]= +static const MY_CASEFOLD_CHARACTER c8FAA[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1341,7 +1341,7 @@ static MY_CASEFOLD_CHARACTER c8FAA[256]= }; -static MY_CASEFOLD_CHARACTER c8FAB[256]= +static const MY_CASEFOLD_CHARACTER c8FAB[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1462,7 +1462,7 @@ static MY_CASEFOLD_CHARACTER c8FAB[256]= }; -static MY_CASEFOLD_CHARACTER c8FF3[256]= +static const MY_CASEFOLD_CHARACTER c8FF3[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1583,7 +1583,7 @@ static MY_CASEFOLD_CHARACTER c8FF3[256]= }; -static MY_CASEFOLD_CHARACTER c8FF4[256]= +static const MY_CASEFOLD_CHARACTER c8FF4[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1704,7 +1704,7 @@ static MY_CASEFOLD_CHARACTER c8FF4[256]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_eucjpms[512]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_eucjpms[512]= { /* JIS-X-0208 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c index 6499a081181..9e6ed3cfabe 100644 --- a/strings/ctype-gb2312.c +++ b/strings/ctype-gb2312.c @@ -177,7 +177,7 @@ static const uchar sort_order_gb2312[]= #include "ctype-mb.inl" -static MY_CASEFOLD_CHARACTER cA2[256]= +static const MY_CASEFOLD_CHARACTER cA2[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -298,7 +298,7 @@ static MY_CASEFOLD_CHARACTER cA2[256]= }; -static MY_CASEFOLD_CHARACTER cA3[256]= +static const MY_CASEFOLD_CHARACTER cA3[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -419,7 +419,7 @@ static MY_CASEFOLD_CHARACTER cA3[256]= }; -static MY_CASEFOLD_CHARACTER cA6[256]= +static const MY_CASEFOLD_CHARACTER cA6[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -540,7 +540,7 @@ static MY_CASEFOLD_CHARACTER cA6[256]= }; -static MY_CASEFOLD_CHARACTER cA7[256]= +static const MY_CASEFOLD_CHARACTER cA7[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -661,7 +661,7 @@ static MY_CASEFOLD_CHARACTER cA7[256]= }; -static MY_CASEFOLD_CHARACTER cA8[256]= +static const MY_CASEFOLD_CHARACTER cA8[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -782,7 +782,7 @@ static MY_CASEFOLD_CHARACTER cA8[256]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_gb2312[256]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_gb2312[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index 1287602b12b..a81e2465157 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -147,7 +147,7 @@ static const uchar to_upper_gbk[]= }; -static MY_CASEFOLD_CHARACTER cA2[256]= +static const MY_CASEFOLD_CHARACTER cA2[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -351,7 +351,7 @@ static MY_CASEFOLD_CHARACTER cA2[256]= {0xA2FF,0xA2FF} }; -static MY_CASEFOLD_CHARACTER cA3[256]= +static const MY_CASEFOLD_CHARACTER cA3[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -556,7 +556,7 @@ static MY_CASEFOLD_CHARACTER cA3[256]= }; -static MY_CASEFOLD_CHARACTER cA6[256]= +static const MY_CASEFOLD_CHARACTER cA6[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -761,7 +761,7 @@ static MY_CASEFOLD_CHARACTER cA6[256]= }; -static MY_CASEFOLD_CHARACTER cA7[256]= +static const MY_CASEFOLD_CHARACTER cA7[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -966,7 +966,7 @@ static MY_CASEFOLD_CHARACTER cA7[256]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_gbk[256]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_gbk[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 88df11ca29e..88dd36312ea 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -63,10 +63,10 @@ size_t my_casedn_str_mb(CHARSET_INFO * cs, char *str) } -static inline MY_CASEFOLD_CHARACTER* +static inline const MY_CASEFOLD_CHARACTER* get_case_info_for_ch(CHARSET_INFO *cs, uint page, uint offs) { - MY_CASEFOLD_CHARACTER *p; + const MY_CASEFOLD_CHARACTER *p; return cs->casefold && (p= cs->casefold->page[page]) ? &p[offs] : NULL; } @@ -97,7 +97,7 @@ my_casefold_mb(CHARSET_INFO *cs, size_t mblen= my_ismbchar(cs, src, srcend); if (mblen) { - MY_CASEFOLD_CHARACTER *ch; + const MY_CASEFOLD_CHARACTER *ch; if ((ch= get_case_info_for_ch(cs, (uchar) src[0], (uchar) src[1]))) { int code= is_upper ? ch->toupper : ch->tolower; diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 5378601e07f..1e3ef16bdb5 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -198,7 +198,7 @@ static const uchar sort_order_sjis[]= #define sjiscode(c,d) ((((uint) (uchar)(c)) << 8) | (uint) (uchar) (d)) -static MY_CASEFOLD_CHARACTER c81[256]= +static const MY_CASEFOLD_CHARACTER c81[256]= { /* 8100-810F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -408,7 +408,7 @@ static MY_CASEFOLD_CHARACTER c81[256]= }; -static MY_CASEFOLD_CHARACTER c82[256]= +static const MY_CASEFOLD_CHARACTER c82[256]= { /* 8200-820F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -616,7 +616,7 @@ static MY_CASEFOLD_CHARACTER c82[256]= }; -static MY_CASEFOLD_CHARACTER c83[256]= +static const MY_CASEFOLD_CHARACTER c83[256]= { /* 8300-830F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -826,7 +826,7 @@ static MY_CASEFOLD_CHARACTER c83[256]= }; -static MY_CASEFOLD_CHARACTER c84[256]= +static const MY_CASEFOLD_CHARACTER c84[256]= { /* 8400-840F */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -1036,7 +1036,7 @@ static MY_CASEFOLD_CHARACTER c84[256]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_sjis[256]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_sjis[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index 58be36f3040..76f000e9ed6 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -65976,7 +65976,7 @@ my_wc_mb_euc_jp(CHARSET_INFO *cs __attribute__((unused)), /* Case info pages for JIS-X-0208 range */ -static MY_CASEFOLD_CHARACTER cA2[256]= +static const MY_CASEFOLD_CHARACTER cA2[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66097,7 +66097,7 @@ static MY_CASEFOLD_CHARACTER cA2[256]= }; -static MY_CASEFOLD_CHARACTER cA3[256]= +static const MY_CASEFOLD_CHARACTER cA3[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66218,7 +66218,7 @@ static MY_CASEFOLD_CHARACTER cA3[256]= }; -static MY_CASEFOLD_CHARACTER cA6[256]= +static const MY_CASEFOLD_CHARACTER cA6[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66339,7 +66339,7 @@ static MY_CASEFOLD_CHARACTER cA6[256]= }; -static MY_CASEFOLD_CHARACTER cA7[256]= +static const MY_CASEFOLD_CHARACTER cA7[256]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66461,7 +66461,7 @@ static MY_CASEFOLD_CHARACTER cA7[256]= /* Case info pages for JIS-X-0212 range */ -static MY_CASEFOLD_CHARACTER c8FA6[]= +static const MY_CASEFOLD_CHARACTER c8FA6[]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66582,7 +66582,7 @@ static MY_CASEFOLD_CHARACTER c8FA6[]= }; -static MY_CASEFOLD_CHARACTER c8FA7[]= +static const MY_CASEFOLD_CHARACTER c8FA7[]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66703,7 +66703,7 @@ static MY_CASEFOLD_CHARACTER c8FA7[]= }; -static MY_CASEFOLD_CHARACTER c8FA9[]= +static const MY_CASEFOLD_CHARACTER c8FA9[]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66824,7 +66824,7 @@ static MY_CASEFOLD_CHARACTER c8FA9[]= }; -static MY_CASEFOLD_CHARACTER c8FAA[]= +static const MY_CASEFOLD_CHARACTER c8FAA[]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -66945,7 +66945,7 @@ static MY_CASEFOLD_CHARACTER c8FAA[]= }; -static MY_CASEFOLD_CHARACTER c8FAB[]= +static const MY_CASEFOLD_CHARACTER c8FAB[]= { {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */ {0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, @@ -67066,7 +67066,7 @@ static MY_CASEFOLD_CHARACTER c8FAB[]= }; -static MY_CASEFOLD_CHARACTER *my_casefold_pages_ujis[512]= +static const MY_CASEFOLD_CHARACTER *my_casefold_pages_ujis[512]= { /* JIS-X-0208 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ @@ -67155,10 +67155,10 @@ static MY_CASEFOLD_INFO my_casefold_info_ujis= UJIS and EUCJPMS share the same UPPER/LOWER functions. */ -static MY_CASEFOLD_CHARACTER* +static const MY_CASEFOLD_CHARACTER* get_case_info_for_ch(CHARSET_INFO *cs, uint plane, uint page, uint offs) { - MY_CASEFOLD_CHARACTER *p; + const MY_CASEFOLD_CHARACTER *p; return (p= cs->casefold->page[page + plane * 256]) ? &p[offs & 0xFF] : NULL; } @@ -67180,7 +67180,7 @@ my_casefold_ujis(CHARSET_INFO *cs, size_t mblen= my_ismbchar(cs, src, srcend); if (mblen) { - MY_CASEFOLD_CHARACTER *ch; + const MY_CASEFOLD_CHARACTER *ch; ch= (mblen == 2) ? get_case_info_for_ch(cs, 0, (uchar) src[0], (uchar) src[1]) : get_case_info_for_ch(cs, 1, (uchar) src[1], (uchar) src[2]); |