Skip to content

Commit 0bf400a

Browse files
abarkovabarkov
committed
A cleanup for MDEV-30695 Refactor case folding data types in Asian collations
Adding "const" qualifiers to casefold_info_st::page
1 parent f14d9fa commit 0bf400a

File tree

10 files changed

+65
-65
lines changed

10 files changed

+65
-65
lines changed

‎include/m_ctype.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ typedef struct casefold_info_char_t
9696
struct casefold_info_st
9797
{
9898
my_wc_t maxchar;
99-
MY_CASEFOLD_CHARACTER **page;
99+
const MY_CASEFOLD_CHARACTER * const *page;
100100
};
101101

102102

‎strings/ctype-big5.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static const uchar sort_order_big5[]=
187187
};
188188

189189

190-
static MY_CASEFOLD_CHARACTER cA2[256]=
190+
static const MY_CASEFOLD_CHARACTER cA2[256]=
191191
{
192192
/* A200-A20F */
193193
{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]=
380380
};
381381

382382

383-
static MY_CASEFOLD_CHARACTER cA3[256]=
383+
static const MY_CASEFOLD_CHARACTER cA3[256]=
384384
{
385385
/* A300-A30F */
386386
{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]=
573573
};
574574

575575

576-
static MY_CASEFOLD_CHARACTER cC7[256]=
576+
static const MY_CASEFOLD_CHARACTER cC7[256]=
577577
{
578578
/* C700-C70F */
579579
{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]=
766766
};
767767

768768

769-
static MY_CASEFOLD_CHARACTER *my_casefold_pages_big5[256]=
769+
static const MY_CASEFOLD_CHARACTER *my_casefold_pages_big5[256]=
770770
{
771771
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */
772772
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

‎strings/ctype-cp932.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static const uchar sort_order_cp932[]=
197197
#define cp932code(c,d) ((((uint) (uchar)(c)) << 8) | (uint) (uchar) (d))
198198

199199

200-
static MY_CASEFOLD_CHARACTER c81[256]=
200+
static const MY_CASEFOLD_CHARACTER c81[256]=
201201
{
202202
/* 8100-810F */
203203
{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]=
407407
};
408408

409409

410-
static MY_CASEFOLD_CHARACTER c82[256]=
410+
static const MY_CASEFOLD_CHARACTER c82[256]=
411411
{
412412
/* 8200-820F */
413413
{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]=
615615
};
616616

617617

618-
static MY_CASEFOLD_CHARACTER c83[256]=
618+
static const MY_CASEFOLD_CHARACTER c83[256]=
619619
{
620620
/* 8300-830F */
621621
{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]=
825825
};
826826

827827

828-
static MY_CASEFOLD_CHARACTER c84[256]=
828+
static const MY_CASEFOLD_CHARACTER c84[256]=
829829
{
830830
/* 8400-840F */
831831
{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]=
10351035
};
10361036

10371037

1038-
static MY_CASEFOLD_CHARACTER c87[256]=
1038+
static const MY_CASEFOLD_CHARACTER c87[256]=
10391039
{
10401040
/* 8700-870F */
10411041
{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]=
12451245
};
12461246

12471247

1248-
static MY_CASEFOLD_CHARACTER cEE[256]=
1248+
static const MY_CASEFOLD_CHARACTER cEE[256]=
12491249
{
12501250
/* EE00-EE0F */
12511251
{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]=
14561456
};
14571457

14581458

1459-
static MY_CASEFOLD_CHARACTER cFA[256]=
1459+
static const MY_CASEFOLD_CHARACTER cFA[256]=
14601460
{
14611461
/* FA00-FA0F */
14621462
{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]=
16661666
};
16671667

16681668

1669-
static MY_CASEFOLD_CHARACTER *my_casefold_pages_cp932[256]=
1669+
static const MY_CASEFOLD_CHARACTER *my_casefold_pages_cp932[256]=
16701670
{
16711671
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */
16721672
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

‎strings/ctype-euc_kr.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static const uchar sort_order_euc_kr[]=
213213
#include "ctype-mb.inl"
214214

215215

216-
static MY_CASEFOLD_CHARACTER cA3[256]=
216+
static const MY_CASEFOLD_CHARACTER cA3[256]=
217217
{
218218
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
219219
{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]=
418418
};
419419

420420

421-
static MY_CASEFOLD_CHARACTER cA5[256]=
421+
static const MY_CASEFOLD_CHARACTER cA5[256]=
422422
{
423423
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
424424
{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]=
623623
};
624624

625625

626-
static MY_CASEFOLD_CHARACTER cA7[256]=
626+
static const MY_CASEFOLD_CHARACTER cA7[256]=
627627
{
628628
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
629629
{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]=
828828
};
829829

830830

831-
static MY_CASEFOLD_CHARACTER cA8[256]=
831+
static const MY_CASEFOLD_CHARACTER cA8[256]=
832832
{
833833
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
834834
{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]=
10331033
};
10341034

10351035

1036-
static MY_CASEFOLD_CHARACTER cA9[256]=
1036+
static const MY_CASEFOLD_CHARACTER cA9[256]=
10371037
{
10381038
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
10391039
{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]=
12381238
};
12391239

12401240

1241-
static MY_CASEFOLD_CHARACTER cAC[256]=
1241+
static const MY_CASEFOLD_CHARACTER cAC[256]=
12421242
{
12431243
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
12441244
{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]=
14431443
};
14441444

14451445

1446-
static MY_CASEFOLD_CHARACTER *my_casefold_pages_euckr[256]=
1446+
static const MY_CASEFOLD_CHARACTER *my_casefold_pages_euckr[256]=
14471447
{
14481448
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */
14491449
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

‎strings/ctype-eucjpms.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static const uchar sort_order_eucjpms[]=
250250

251251
/* Case info pages for JIS-X-0208 range */
252252

253-
static MY_CASEFOLD_CHARACTER cA2[256]=
253+
static const MY_CASEFOLD_CHARACTER cA2[256]=
254254
{
255255
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
256256
{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]=
371371
};
372372

373373

374-
static MY_CASEFOLD_CHARACTER cA3[256]=
374+
static const MY_CASEFOLD_CHARACTER cA3[256]=
375375
{
376376
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
377377
{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]=
492492
};
493493

494494

495-
static MY_CASEFOLD_CHARACTER cA6[256]=
495+
static const MY_CASEFOLD_CHARACTER cA6[256]=
496496
{
497497
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
498498
{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]=
613613
};
614614

615615

616-
static MY_CASEFOLD_CHARACTER cA7[256]=
616+
static const MY_CASEFOLD_CHARACTER cA7[256]=
617617
{
618618
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
619619
{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]=
734734
};
735735

736736

737-
static MY_CASEFOLD_CHARACTER cAD[256]=
737+
static const MY_CASEFOLD_CHARACTER cAD[256]=
738738
{
739739
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
740740
{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]=
857857

858858
/* Case info pages for JIS-X-0212 range */
859859

860-
static MY_CASEFOLD_CHARACTER c8FA6[256]=
860+
static const MY_CASEFOLD_CHARACTER c8FA6[256]=
861861
{
862862
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
863863
{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]=
978978
};
979979

980980

981-
static MY_CASEFOLD_CHARACTER c8FA7[256]=
981+
static const MY_CASEFOLD_CHARACTER c8FA7[256]=
982982
{
983983
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
984984
{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]=
10991099
};
11001100

11011101

1102-
static MY_CASEFOLD_CHARACTER c8FA9[256]=
1102+
static const MY_CASEFOLD_CHARACTER c8FA9[256]=
11031103
{
11041104
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
11051105
{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]=
12201220
};
12211221

12221222

1223-
static MY_CASEFOLD_CHARACTER c8FAA[256]=
1223+
static const MY_CASEFOLD_CHARACTER c8FAA[256]=
12241224
{
12251225
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
12261226
{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]=
13411341
};
13421342

13431343

1344-
static MY_CASEFOLD_CHARACTER c8FAB[256]=
1344+
static const MY_CASEFOLD_CHARACTER c8FAB[256]=
13451345
{
13461346
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
13471347
{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]=
14621462
};
14631463

14641464

1465-
static MY_CASEFOLD_CHARACTER c8FF3[256]=
1465+
static const MY_CASEFOLD_CHARACTER c8FF3[256]=
14661466
{
14671467
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
14681468
{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]=
15831583
};
15841584

15851585

1586-
static MY_CASEFOLD_CHARACTER c8FF4[256]=
1586+
static const MY_CASEFOLD_CHARACTER c8FF4[256]=
15871587
{
15881588
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
15891589
{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]=
17041704
};
17051705

17061706

1707-
static MY_CASEFOLD_CHARACTER *my_casefold_pages_eucjpms[512]=
1707+
static const MY_CASEFOLD_CHARACTER *my_casefold_pages_eucjpms[512]=
17081708
{
17091709
/* JIS-X-0208 */
17101710
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */

‎strings/ctype-gb2312.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static const uchar sort_order_gb2312[]=
177177
#include "ctype-mb.inl"
178178

179179

180-
static MY_CASEFOLD_CHARACTER cA2[256]=
180+
static const MY_CASEFOLD_CHARACTER cA2[256]=
181181
{
182182
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
183183
{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]=
298298
};
299299

300300

301-
static MY_CASEFOLD_CHARACTER cA3[256]=
301+
static const MY_CASEFOLD_CHARACTER cA3[256]=
302302
{
303303
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
304304
{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]=
419419
};
420420

421421

422-
static MY_CASEFOLD_CHARACTER cA6[256]=
422+
static const MY_CASEFOLD_CHARACTER cA6[256]=
423423
{
424424
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
425425
{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]=
540540
};
541541

542542

543-
static MY_CASEFOLD_CHARACTER cA7[256]=
543+
static const MY_CASEFOLD_CHARACTER cA7[256]=
544544
{
545545
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
546546
{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]=
661661
};
662662

663663

664-
static MY_CASEFOLD_CHARACTER cA8[256]=
664+
static const MY_CASEFOLD_CHARACTER cA8[256]=
665665
{
666666
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
667667
{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]=
782782
};
783783

784784

785-
static MY_CASEFOLD_CHARACTER *my_casefold_pages_gb2312[256]=
785+
static const MY_CASEFOLD_CHARACTER *my_casefold_pages_gb2312[256]=
786786
{
787787
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */
788788
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

‎strings/ctype-gbk.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static const uchar to_upper_gbk[]=
147147
};
148148

149149

150-
static MY_CASEFOLD_CHARACTER cA2[256]=
150+
static const MY_CASEFOLD_CHARACTER cA2[256]=
151151
{
152152
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
153153
{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]=
351351
{0xA2FF,0xA2FF}
352352
};
353353

354-
static MY_CASEFOLD_CHARACTER cA3[256]=
354+
static const MY_CASEFOLD_CHARACTER cA3[256]=
355355
{
356356
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
357357
{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]=
556556
};
557557

558558

559-
static MY_CASEFOLD_CHARACTER cA6[256]=
559+
static const MY_CASEFOLD_CHARACTER cA6[256]=
560560
{
561561
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
562562
{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]=
761761
};
762762

763763

764-
static MY_CASEFOLD_CHARACTER cA7[256]=
764+
static const MY_CASEFOLD_CHARACTER cA7[256]=
765765
{
766766
{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, /* xx00 */
767767
{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]=
966966
};
967967

968968

969-
static MY_CASEFOLD_CHARACTER *my_casefold_pages_gbk[256]=
969+
static const MY_CASEFOLD_CHARACTER *my_casefold_pages_gbk[256]=
970970
{
971971
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */
972972
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

0 commit comments

Comments
 (0)