Skip to content

Commit a06c20a

Browse files
committed
Remove useless constant MBFL_ENCTYPE_MBCS
This flag indicated that an encoding was 'multi-byte'; it can use a variable number of bytes to encode each character. As it turns out, we don't actually need to check this flag anywhere, so it's better to remove it.
1 parent 6cbeb64 commit a06c20a

30 files changed

+42
-49
lines changed

ext/mbstring/libmbfl/filters/mbfilter_big5.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const mbfl_encoding mbfl_encoding_big5 = {
5959
"BIG5",
6060
mbfl_encoding_big5_aliases,
6161
mblen_table_big5,
62-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
62+
MBFL_ENCTYPE_GL_UNSAFE,
6363
&vtbl_big5_wchar,
6464
&vtbl_wchar_big5
6565
};
@@ -70,7 +70,7 @@ const mbfl_encoding mbfl_encoding_cp950 = {
7070
"BIG5",
7171
NULL,
7272
mblen_table_big5,
73-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
73+
MBFL_ENCTYPE_GL_UNSAFE,
7474
&vtbl_cp950_wchar,
7575
&vtbl_wchar_cp950
7676
};

ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const mbfl_encoding mbfl_encoding_cp50220 = {
5858
"ISO-2022-JP",
5959
cp50220_aliases,
6060
NULL,
61-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
61+
MBFL_ENCTYPE_GL_UNSAFE,
6262
&vtbl_cp50220_wchar,
6363
&vtbl_wchar_cp50220
6464
};
@@ -69,7 +69,7 @@ const mbfl_encoding mbfl_encoding_cp50221 = {
6969
"ISO-2022-JP",
7070
NULL,
7171
NULL,
72-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
72+
MBFL_ENCTYPE_GL_UNSAFE,
7373
&vtbl_cp50221_wchar,
7474
&vtbl_wchar_cp50221
7575
};
@@ -80,7 +80,7 @@ const mbfl_encoding mbfl_encoding_cp50222 = {
8080
"ISO-2022-JP",
8181
NULL,
8282
NULL,
83-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
83+
MBFL_ENCTYPE_GL_UNSAFE,
8484
&vtbl_cp50222_wchar,
8585
&vtbl_wchar_cp50222
8686
};

ext/mbstring/libmbfl/filters/mbfilter_cp51932.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const mbfl_encoding mbfl_encoding_cp51932 = {
6363
"CP51932",
6464
mbfl_encoding_cp51932_aliases,
6565
mblen_table_eucjp,
66-
MBFL_ENCTYPE_MBCS,
66+
0,
6767
&vtbl_cp51932_wchar,
6868
&vtbl_wchar_cp51932
6969
};

ext/mbstring/libmbfl/filters/mbfilter_cp932.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const mbfl_encoding mbfl_encoding_cp932 = {
6262
"Shift_JIS",
6363
mbfl_encoding_cp932_aliases,
6464
mblen_table_sjis,
65-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
65+
MBFL_ENCTYPE_GL_UNSAFE,
6666
&vtbl_cp932_wchar,
6767
&vtbl_wchar_cp932
6868
};

ext/mbstring/libmbfl/filters/mbfilter_cp936.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const mbfl_encoding mbfl_encoding_cp936 = {
5959
"CP936",
6060
mbfl_encoding_cp936_aliases,
6161
mblen_table_cp936,
62-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
62+
MBFL_ENCTYPE_GL_UNSAFE,
6363
&vtbl_cp936_wchar,
6464
&vtbl_wchar_cp936
6565
};

ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const mbfl_encoding mbfl_encoding_euc_cn = {
5959
"CN-GB",
6060
mbfl_encoding_euc_cn_aliases,
6161
mblen_table_euccn,
62-
MBFL_ENCTYPE_MBCS,
62+
0,
6363
&vtbl_euccn_wchar,
6464
&vtbl_wchar_euccn
6565
};

ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const mbfl_encoding mbfl_encoding_euc_jp = {
6262
"EUC-JP",
6363
mbfl_encoding_euc_jp_aliases,
6464
mblen_table_eucjp,
65-
MBFL_ENCTYPE_MBCS,
65+
0,
6666
&vtbl_eucjp_wchar,
6767
&vtbl_wchar_eucjp
6868
};

ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const mbfl_encoding mbfl_encoding_eucjp2004 = {
4141
"EUC-JP",
4242
mbfl_encoding_eucjp2004_aliases,
4343
mblen_table_eucjp,
44-
MBFL_ENCTYPE_MBCS,
44+
0,
4545
&vtbl_eucjp2004_wchar,
4646
&vtbl_wchar_eucjp2004
4747
};

ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const mbfl_encoding mbfl_encoding_eucjp_win = {
6161
"EUC-JP",
6262
mbfl_encoding_eucjp_win_aliases,
6363
mblen_table_eucjp,
64-
MBFL_ENCTYPE_MBCS,
64+
0,
6565
&vtbl_eucjpwin_wchar,
6666
&vtbl_wchar_eucjpwin
6767
};

ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const mbfl_encoding mbfl_encoding_euc_kr = {
5858
"EUC-KR",
5959
mbfl_encoding_euc_kr_aliases,
6060
mblen_table_euckr,
61-
MBFL_ENCTYPE_MBCS,
61+
0,
6262
&vtbl_euckr_wchar,
6363
&vtbl_wchar_euckr
6464
};

0 commit comments

Comments
 (0)