mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A cleanup for MDEV-30695 Refactor case folding data types in Asian collations

Browse source 
Adding "const" qualifiers to casefold_info_st::page
This commit is contained in:
Alexander Barkov 2023-03-03 04:10:58 +04:00
parent f14d9fa09a
commit 0bf400a19a
10 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/m_ctype.h
View file

@ -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;
};

8
strings/ctype-big5.c
View file

@ -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,

16
strings/ctype-cp932.c
View file

@ -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,

14
strings/ctype-euc_kr.c
View file

@ -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,

26
strings/ctype-eucjpms.c
View file

@ -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 */

12
strings/ctype-gb2312.c
View file

@ -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,

10
strings/ctype-gbk.c
View file

@ -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,

6
strings/ctype-mb.c
View file

@ -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;

10
strings/ctype-sjis.c
View file

@ -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,

26
strings/ctype-ujis.c
View file

@ -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]);