com php-src: Store input and output filters in mbfl encodings: ext/mbstring/libmbfl/filters/mbfilter_7bit.c ext/mbstri
ng/libmbfl/filters/mbfilter_armscii8.c ext/mbstring/lib mbfl/filters/mbfilter_ascii.c ext/mbstring/libmbfl/filter s/mbfilter_base64.c
ext/mbstring/libmbfl/filters/mbfi lter_big5.c ext/mbstring/libmbfl/filters/mbfilter_byt e2.c ext/mbstring/libmbfl/filters/mbfilter_byte4.c
ext/mbstring/libmbfl/filters/mbfilter_cp1251.c ext/mbstring/lib
| From: | Nikita Popov | Date: | Fri, 04 Aug 2017 20:22:58 +0000 |
| Subject: | com php-src: Store input and output filters in mbfl encodings: ext/mbstring/libmbfl/filters/mbfilter_7bit.c ext/mbstri ng/libmbfl/filters/mbfilter_armscii8.c ext/mbstring/lib mbfl/filters/mbfilter_ascii.c ext/mbstring/libmbfl/filter s/mbfilter_base64.c ext/mbstring/libmbfl/filters/mbfi lter_big5.c ext/mbstring/libmbfl/filters/mbfilter_byt e2.c ext/mbstring/libmbfl/filters/mbfilter_byte4.c ext/mbstring/libmbfl/filters/mbfilter_cp1251.c ext/mbstring/lib |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98954@lists.php.net to get a copy of this message | ||
Commit: 633a471ba0c9acc6d1cca04880c1e69e7b2dc18e
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 4 Aug 2017 18:38:36 +0200
Parents: e20fbd43bad65d10af1e0d648f7bfa0c40baa893
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=633a471ba0c9acc6d1cca04880c1e69e7b2dc18e
Log:
Store input and output filters in mbfl encodings
For functions like mb_chr() and mb_ord() just looking up the
input/output filter for the encoding dominates the runtime. This
commit stores the input/output filter for an encoding in the
mbfl encoding structure, so it can be looked up directly, rather
than scanning through filter function lists.
Changed paths:
M ext/mbstring/libmbfl/filters/mbfilter_7bit.c
M ext/mbstring/libmbfl/filters/mbfilter_armscii8.c
M ext/mbstring/libmbfl/filters/mbfilter_ascii.c
M ext/mbstring/libmbfl/filters/mbfilter_base64.c
M ext/mbstring/libmbfl/filters/mbfilter_big5.c
M ext/mbstring/libmbfl/filters/mbfilter_byte2.c
M ext/mbstring/libmbfl/filters/mbfilter_byte4.c
M ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
M ext/mbstring/libmbfl/filters/mbfilter_cp1252.c
M ext/mbstring/libmbfl/filters/mbfilter_cp1254.c
M ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
M ext/mbstring/libmbfl/filters/mbfilter_cp51932.c
M ext/mbstring/libmbfl/filters/mbfilter_cp850.c
M ext/mbstring/libmbfl/filters/mbfilter_cp866.c
M ext/mbstring/libmbfl/filters/mbfilter_cp932.c
M ext/mbstring/libmbfl/filters/mbfilter_cp936.c
M ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c
M ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c
M ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c
M ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
M ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c
M ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
M ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
M ext/mbstring/libmbfl/filters/mbfilter_hz.c
M ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
M ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
M ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
M ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
M ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
M ext/mbstring/libmbfl/filters/mbfilter_jis.c
M ext/mbstring/libmbfl/filters/mbfilter_koi8r.c
M ext/mbstring/libmbfl/filters/mbfilter_koi8u.c
M ext/mbstring/libmbfl/filters/mbfilter_qprint.c
M ext/mbstring/libmbfl/filters/mbfilter_sjis.c
M ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
M ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c
M ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
M ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c
M ext/mbstring/libmbfl/filters/mbfilter_ucs2.c
M ext/mbstring/libmbfl/filters/mbfilter_ucs4.c
M ext/mbstring/libmbfl/filters/mbfilter_uhc.c
M ext/mbstring/libmbfl/filters/mbfilter_utf16.c
M ext/mbstring/libmbfl/filters/mbfilter_utf32.c
M ext/mbstring/libmbfl/filters/mbfilter_utf7.c
M ext/mbstring/libmbfl/filters/mbfilter_utf8.c
M ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
M ext/mbstring/libmbfl/filters/mbfilter_uuencode.c
M ext/mbstring/libmbfl/mbfl/mbfilter.c
M ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c
M ext/mbstring/libmbfl/mbfl/mbfilter_pass.c
M ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c
M ext/mbstring/libmbfl/mbfl/mbfl_convert.c
M ext/mbstring/libmbfl/mbfl/mbfl_convert.h
M ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
M ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c index ab17271..382c874 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_7bit = { "7bit", NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_8bit_7bit = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c index ad2cf0c..bfe3763 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c @@ -44,7 +44,9 @@ const mbfl_encoding mbfl_encoding_armscii8 = { "ArmSCII-8", (const char *(*)[])&mbfl_encoding_armscii8_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_armscii8_wchar, + &vtbl_wchar_armscii8 }; const struct mbfl_identify_vtbl vtbl_identify_armscii8 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c index e9eb496..b3c1161 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_ascii = { "US-ASCII", /* preferred MIME name */ (const char *(*)[])&mbfl_encoding_ascii_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_ascii_wchar, + &vtbl_wchar_ascii }; const struct mbfl_identify_vtbl vtbl_identify_ascii = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c index adecdee..661e1a4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_base64 = { "BASE64", NULL, NULL, - MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_8bit_b64 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c index 122ff4c..21aac8e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_big5 = { "BIG5", (const char *(*)[])&mbfl_encoding_big5_aliases, mblen_table_big5, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_big5_wchar, + &vtbl_wchar_big5 }; const mbfl_encoding mbfl_encoding_cp950 = { @@ -74,7 +76,9 @@ const mbfl_encoding mbfl_encoding_cp950 = { "BIG5", NULL, mblen_table_big5, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp950_wchar, + &vtbl_wchar_cp950 }; const struct mbfl_identify_vtbl vtbl_identify_big5 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c index 7452c12..9be0fb9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_byte2be = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte2be_wchar, + &vtbl_wchar_byte2be }; const mbfl_encoding mbfl_encoding_byte2le = { @@ -50,7 +52,9 @@ const mbfl_encoding mbfl_encoding_byte2le = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte2le_wchar, + &vtbl_wchar_byte2le }; const struct mbfl_convert_vtbl vtbl_byte2be_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c index 7475e54..46ca04b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_byte4be = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte4be_wchar, + &vtbl_wchar_byte4be }; const mbfl_encoding mbfl_encoding_byte4le = { @@ -50,7 +52,9 @@ const mbfl_encoding mbfl_encoding_byte4le = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte4le_wchar, + &vtbl_wchar_byte4le }; const struct mbfl_convert_vtbl vtbl_byte4be_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index a26ce19..532806f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp1251 = { "Windows-1251", (const char *(*)[])&mbfl_encoding_cp1251_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp1251_wchar, + &vtbl_wchar_cp1251 }; const struct mbfl_identify_vtbl vtbl_identify_cp1251 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c index 0c5eba3..6479023 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp1252 = { "Windows-1252", (const char *(*)[])&mbfl_encoding_cp1252_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp1252_wchar, + &vtbl_wchar_cp1252 }; const struct mbfl_identify_vtbl vtbl_identify_cp1252 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c index 78e7933..b01b19f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp1254 = { "Windows-1254", (const char *(*)[])&mbfl_encoding_cp1254_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp1254_wchar, + &vtbl_wchar_cp1254 }; const struct mbfl_identify_vtbl vtbl_identify_cp1254 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c index 75d249f..81b655d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -54,7 +54,9 @@ const mbfl_encoding mbfl_encoding_jis_ms = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_jis_ms_wchar, + &vtbl_wchar_jis_ms }; const mbfl_encoding mbfl_encoding_cp50220 = { @@ -63,7 +65,9 @@ const mbfl_encoding mbfl_encoding_cp50220 = { "ISO-2022-JP", (const char *(*)[])NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50220_wchar, + &vtbl_wchar_cp50220 }; const mbfl_encoding mbfl_encoding_cp50220raw = { @@ -72,7 +76,9 @@ const mbfl_encoding mbfl_encoding_cp50220raw = { "ISO-2022-JP", (const char *(*)[])NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50220raw_wchar, + &vtbl_wchar_cp50220raw }; const mbfl_encoding mbfl_encoding_cp50221 = { @@ -81,7 +87,9 @@ const mbfl_encoding mbfl_encoding_cp50221 = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50221_wchar, + &vtbl_wchar_cp50221 }; const mbfl_encoding mbfl_encoding_cp50222 = { @@ -90,7 +98,9 @@ const mbfl_encoding mbfl_encoding_cp50222 = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50222_wchar, + &vtbl_wchar_cp50222 }; const struct mbfl_identify_vtbl vtbl_identify_jis_ms = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index aae4538..057d6c6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -75,7 +75,9 @@ const mbfl_encoding mbfl_encoding_cp51932 = { "CP51932", (const char *(*)[])&mbfl_encoding_cp51932_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_cp51932_wchar, + &vtbl_wchar_cp51932 }; const struct mbfl_convert_vtbl vtbl_cp51932_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c index 179873e..25ec247 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_cp850 = { "CP850", (const char *(*)[])&mbfl_encoding_cp850_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp850_wchar, + &vtbl_wchar_cp850 }; const struct mbfl_identify_vtbl vtbl_identify_cp850 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c index 307f370..95b6812 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp866 = { "CP866", (const char *(*)[])&mbfl_encoding_cp866_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp866_wchar, + &vtbl_wchar_cp866 }; const struct mbfl_identify_vtbl vtbl_identify_cp866 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c index 4063a68..e6cbd5f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -66,7 +66,9 @@ const mbfl_encoding mbfl_encoding_cp932 = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_cp932_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp932_wchar, + &vtbl_wchar_cp932 }; const struct mbfl_identify_vtbl vtbl_identify_cp932 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c index 23e3a1d..047eb62 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_cp936 = { "CP936", (const char *(*)[])&mbfl_encoding_cp936_aliases, mblen_table_cp936, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp936_wchar, + &vtbl_wchar_cp936 }; const struct mbfl_identify_vtbl vtbl_identify_cp936 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c index bf3ec25..7fd3d7c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_euc_cn = { "CN-GB", (const char *(*)[])&mbfl_encoding_euc_cn_aliases, mblen_table_euccn, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_euccn_wchar, + &vtbl_wchar_euccn }; const struct mbfl_identify_vtbl vtbl_identify_euccn = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c index 3b13850..ba79493 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -66,7 +66,9 @@ const mbfl_encoding mbfl_encoding_euc_jp = { "EUC-JP", (const char *(*)[])&mbfl_encoding_euc_jp_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_eucjp_wchar, + &vtbl_wchar_eucjp }; const struct mbfl_identify_vtbl vtbl_identify_eucjp = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c index aeb94c3..2fe24e0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -48,7 +48,9 @@ const mbfl_encoding mbfl_encoding_eucjp2004 = { "EUC-JP", (const char *(*)[])&mbfl_encoding_eucjp2004_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_eucjp2004_wchar, + &vtbl_wchar_eucjp2004 }; const struct mbfl_identify_vtbl vtbl_identify_eucjp2004 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c index 95aec45..912ae73 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -76,7 +76,9 @@ const mbfl_encoding mbfl_encoding_eucjp_win = { "EUC-JP", (const char *(*)[])&mbfl_encoding_eucjp_win_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_eucjpwin_wchar, + &vtbl_wchar_eucjpwin }; const struct mbfl_convert_vtbl vtbl_eucjpwin_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c index 2a537ad..ee8dc92 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c @@ -64,7 +64,9 @@ const mbfl_encoding mbfl_encoding_euc_kr = { "EUC-KR", (const char *(*)[])&mbfl_encoding_euc_kr_aliases, mblen_table_euckr, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_euckr_wchar, + &vtbl_wchar_euckr }; const struct mbfl_identify_vtbl vtbl_identify_euckr = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index 721c162..b7687b6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -47,7 +47,9 @@ const mbfl_encoding mbfl_encoding_gb18030 = { "GB18030", (const char *(*)[])&mbfl_encoding_gb18030_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_gb18030_wchar, + &vtbl_wchar_gb18030 }; const struct mbfl_identify_vtbl vtbl_identify_gb18030 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c index 03b26cc..12ff178 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c @@ -70,7 +70,9 @@ const mbfl_encoding mbfl_encoding_html_ent = { "HTML-ENTITIES", (const char *(*)[])&mbfl_encoding_html_ent_aliases, NULL, - MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_html_wchar, + &vtbl_wchar_html }; const struct mbfl_convert_vtbl vtbl_wchar_html = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.c b/ext/mbstring/libmbfl/filters/mbfilter_hz.c index a3422cd..8a39b75 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_hz.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.c @@ -44,7 +44,9 @@ const mbfl_encoding mbfl_encoding_hz = { "HZ-GB-2312", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_hz_wchar, + &vtbl_wchar_hz }; const struct mbfl_identify_vtbl vtbl_identify_hz = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c index 1f26d17..4e8b974 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c @@ -48,7 +48,9 @@ const mbfl_encoding mbfl_encoding_2022jpms = { "ISO-2022-JP", (const char *(*)[])&mbfl_encoding_2022jpms_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jpms_wchar, + &vtbl_wchar_2022jpms }; const struct mbfl_identify_vtbl vtbl_identify_2022jpms = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c index 501bcb8..c1fe9f1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_2022kr = { "ISO-2022-KR", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022kr_wchar, + &vtbl_wchar_2022kr }; const struct mbfl_identify_vtbl vtbl_identify_2022kr = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c index fc6678e..17355bf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -47,7 +47,9 @@ const mbfl_encoding mbfl_encoding_2022jp_2004 = { "ISO-2022-JP-2004", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jp_2004_wchar, + &vtbl_wchar_2022jp_2004 }; const struct mbfl_identify_vtbl vtbl_identify_2022jp_2004 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c index e0d5543..3847f78 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c @@ -50,7 +50,9 @@ const mbfl_encoding mbfl_encoding_2022jp_kddi = { "ISO-2022-JP", &mbfl_encoding_2022jp_kddi_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jp_kddi_wchar, + &vtbl_wchar_2022jp_kddi }; const struct mbfl_identify_vtbl vtbl_identify_2022jp_kddi = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c index 382d0c2..239d74e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_8859_1 = { "ISO-8859-1", (const char *(*)[])&mbfl_encoding_8859_1_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_1_wchar, + &vtbl_wchar_8859_1 }; const struct mbfl_identify_vtbl vtbl_identify_8859_1 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c index f6d1b21..0fb6bc8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_10 = { "ISO-8859-10", (const char *(*)[])&mbfl_encoding_8859_10_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_10_wchar, + &vtbl_wchar_8859_10 }; const struct mbfl_identify_vtbl vtbl_identify_8859_10 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c index cbc8f77..2b2494b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_13 = { "ISO-8859-13", (const char *(*)[])&mbfl_encoding_8859_13_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_13_wchar, + &vtbl_wchar_8859_13 }; const struct mbfl_identify_vtbl vtbl_identify_8859_13 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c index 03581cc..eb008b8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_14 = { "ISO-8859-14", (const char *(*)[])&mbfl_encoding_8859_14_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_14_wchar, + &vtbl_wchar_8859_14 }; const struct mbfl_identify_vtbl vtbl_identify_8859_14 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c index 25323bd..74e5a2d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_15 = { "ISO-8859-15", (const char *(*)[])&mbfl_encoding_8859_15_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_15_wchar, + &vtbl_wchar_8859_15 }; const struct mbfl_identify_vtbl vtbl_identify_8859_15 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c index 1bd5f8a..68da24f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_16 = { "ISO-8859-16", (const char *(*)[])&mbfl_encoding_8859_16_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_16_wchar, + &vtbl_wchar_8859_16 }; const struct mbfl_identify_vtbl vtbl_identify_8859_16 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c index 50649dd..ec1b2bc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_2 = { "ISO-8859-2", (const char *(*)[])&mbfl_encoding_8859_2_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_2_wchar, + &vtbl_wchar_8859_2 }; const struct mbfl_identify_vtbl vtbl_identify_8859_2 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c index e189706..f3905ac 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_3 = { "ISO-8859-3", (const char *(*)[])&mbfl_encoding_8859_3_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_3_wchar, + &vtbl_wchar_8859_3 }; const struct mbfl_identify_vtbl vtbl_identify_8859_3 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c index a04910e..19e105a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_4 = { "ISO-8859-4", (const char *(*)[])&mbfl_encoding_8859_4_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_4_wchar, + &vtbl_wchar_8859_4 }; const struct mbfl_identify_vtbl vtbl_identify_8859_4 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c index 0bd4d5e..ac3b2d2 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_5 = { "ISO-8859-5", (const char *(*)[])&mbfl_encoding_8859_5_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_5_wchar, + &vtbl_wchar_8859_5 }; const struct mbfl_identify_vtbl vtbl_identify_8859_5 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c index df89eb7..c5bbdd7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_6 = { "ISO-8859-6", (const char *(*)[])&mbfl_encoding_8859_6_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_6_wchar, + &vtbl_wchar_8859_6 }; const struct mbfl_identify_vtbl vtbl_identify_8859_6 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c index d8d4494..98ffade 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_7 = { "ISO-8859-7", (const char *(*)[])&mbfl_encoding_8859_7_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_7_wchar, + &vtbl_wchar_8859_7 }; const struct mbfl_identify_vtbl vtbl_identify_8859_7 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c index fad0f5c..3d65ce6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_8 = { "ISO-8859-8", (const char *(*)[])&mbfl_encoding_8859_8_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_8_wchar, + &vtbl_wchar_8859_8 }; const struct mbfl_identify_vtbl vtbl_identify_8859_8 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c index 97948d0..8a730ae 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_9 = { "ISO-8859-9", (const char *(*)[])&mbfl_encoding_8859_9_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_9_wchar, + &vtbl_wchar_8859_9 }; const struct mbfl_identify_vtbl vtbl_identify_8859_9 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c index b3fbb4f..88395cb 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -46,7 +46,9 @@ const mbfl_encoding mbfl_encoding_jis = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_jis_wchar, + &vtbl_wchar_jis }; const mbfl_encoding mbfl_encoding_2022jp = { @@ -55,7 +57,9 @@ const mbfl_encoding mbfl_encoding_2022jp = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jp_wchar, + &vtbl_wchar_2022jp }; const struct mbfl_identify_vtbl vtbl_identify_jis = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c index e35a025..101b3f1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_koi8r = { "KOI8-R", (const char *(*)[])&mbfl_encoding_koi8r_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_koi8r_wchar, + &vtbl_wchar_koi8r }; const struct mbfl_identify_vtbl vtbl_identify_koi8r = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c index 4dfc686..2517432 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_koi8u = { "KOI8-U", (const char *(*)[])&mbfl_encoding_koi8u_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_koi8u_wchar, + &vtbl_wchar_koi8u }; const struct mbfl_identify_vtbl vtbl_identify_koi8u = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index c141dc4..b72724f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_qprint = { "Quoted-Printable", (const char *(*)[])&mbfl_encoding_qprint_aliases, NULL, - MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_8bit_qprint = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c index 782e0df..33b1e1f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -69,7 +69,9 @@ const mbfl_encoding mbfl_encoding_sjis = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_wchar, + &vtbl_wchar_sjis }; const struct mbfl_identify_vtbl vtbl_identify_sjis = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c index 4f146ce..dd37bba 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c @@ -53,7 +53,9 @@ const mbfl_encoding mbfl_encoding_sjis2004 = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis2004_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis2004_wchar, + &vtbl_wchar_sjis2004 }; const struct mbfl_identify_vtbl vtbl_identify_sjis2004 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c index 2087786..ff08cf3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -52,7 +52,9 @@ const mbfl_encoding mbfl_encoding_sjis_mac = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_mac_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_mac_wchar, + &vtbl_wchar_sjis_mac }; const struct mbfl_identify_vtbl vtbl_identify_sjis_mac = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index a856aa3..ca3d437 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -54,7 +54,9 @@ const mbfl_encoding mbfl_encoding_sjis_docomo = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_docomo_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_docomo_wchar, + &vtbl_wchar_sjis_docomo }; const mbfl_encoding mbfl_encoding_sjis_kddi = { @@ -63,7 +65,9 @@ const mbfl_encoding mbfl_encoding_sjis_kddi = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_kddi_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_kddi_wchar, + &vtbl_wchar_sjis_kddi }; const mbfl_encoding mbfl_encoding_sjis_sb = { @@ -72,7 +76,9 @@ const mbfl_encoding mbfl_encoding_sjis_sb = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_sb_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_sb_wchar, + &vtbl_wchar_sjis_sb }; const struct mbfl_identify_vtbl vtbl_identify_sjis_docomo = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c index 265c577..17e7879 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -66,7 +66,9 @@ const mbfl_encoding mbfl_encoding_sjis_open = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_open_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_open_wchar, + &vtbl_wchar_sjis_open }; const struct mbfl_identify_vtbl vtbl_identify_sjis_open = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c index 32f174f..08cbf6d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_ucs2 = { "UCS-2", (const char *(*)[])&mbfl_encoding_ucs2_aliases, NULL, - MBFL_ENCTYPE_WCS2BE + MBFL_ENCTYPE_WCS2BE, + &vtbl_ucs2_wchar, + &vtbl_wchar_ucs2 }; const mbfl_encoding mbfl_encoding_ucs2be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_ucs2be = { "UCS-2BE", NULL, NULL, - MBFL_ENCTYPE_WCS2BE + MBFL_ENCTYPE_WCS2BE, + &vtbl_ucs2be_wchar, + &vtbl_wchar_ucs2be }; const mbfl_encoding mbfl_encoding_ucs2le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_ucs2le = { "UCS-2LE", NULL, NULL, - MBFL_ENCTYPE_WCS2LE + MBFL_ENCTYPE_WCS2LE, + &vtbl_ucs2le_wchar, + &vtbl_wchar_ucs2le }; const struct mbfl_convert_vtbl vtbl_ucs2_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c index 8906b8f..011c93f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_ucs4 = { "UCS-4", (const char *(*)[])&mbfl_encoding_ucs4_aliases, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_ucs4_wchar, + &vtbl_wchar_ucs4 }; const mbfl_encoding mbfl_encoding_ucs4be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_ucs4be = { "UCS-4BE", NULL, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_ucs4be_wchar, + &vtbl_wchar_ucs4be }; const mbfl_encoding mbfl_encoding_ucs4le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_ucs4le = { "UCS-4LE", NULL, NULL, - MBFL_ENCTYPE_WCS4LE + MBFL_ENCTYPE_WCS4LE, + &vtbl_ucs4le_wchar, + &vtbl_wchar_ucs4le }; const struct mbfl_convert_vtbl vtbl_ucs4_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c index 2e1c696..1603793 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_uhc = { "UHC", (const char *(*)[])&mbfl_encoding_uhc_aliases, mblen_table_uhc, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_uhc_wchar, + &vtbl_wchar_uhc }; const struct mbfl_identify_vtbl vtbl_identify_uhc = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c index 3e008e8..a4864cd 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_utf16 = { "UTF-16", (const char *(*)[])&mbfl_encoding_utf16_aliases, NULL, - MBFL_ENCTYPE_MWC2BE + MBFL_ENCTYPE_MWC2BE, + &vtbl_utf16_wchar, + &vtbl_wchar_utf16 }; const mbfl_encoding mbfl_encoding_utf16be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_utf16be = { "UTF-16BE", NULL, NULL, - MBFL_ENCTYPE_MWC2BE + MBFL_ENCTYPE_MWC2BE, + &vtbl_utf16be_wchar, + &vtbl_wchar_utf16be }; const mbfl_encoding mbfl_encoding_utf16le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_utf16le = { "UTF-16LE", NULL, NULL, - MBFL_ENCTYPE_MWC2LE + MBFL_ENCTYPE_MWC2LE, + &vtbl_utf16le_wchar, + &vtbl_wchar_utf16le }; const struct mbfl_convert_vtbl vtbl_utf16_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c index 852bca2..5b02362 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_utf32 = { "UTF-32", (const char *(*)[])&mbfl_encoding_utf32_aliases, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_utf32_wchar, + &vtbl_wchar_utf32 }; const mbfl_encoding mbfl_encoding_utf32be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_utf32be = { "UTF-32BE", NULL, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_utf32be_wchar, + &vtbl_wchar_utf32be }; const mbfl_encoding mbfl_encoding_utf32le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_utf32le = { "UTF-32LE", NULL, NULL, - MBFL_ENCTYPE_WCS4LE + MBFL_ENCTYPE_WCS4LE, + &vtbl_utf32le_wchar, + &vtbl_wchar_utf32le }; const struct mbfl_convert_vtbl vtbl_utf32_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c index db0979c..f31da86 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -57,7 +57,9 @@ const mbfl_encoding mbfl_encoding_utf7 = { "UTF-7", (const char *(*)[])&mbfl_encoding_utf7_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_utf7_wchar, + &vtbl_wchar_utf7 }; const struct mbfl_identify_vtbl vtbl_identify_utf7 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c index e81e086..1e2ad5b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c @@ -63,7 +63,9 @@ const mbfl_encoding mbfl_encoding_utf8 = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_wchar, + &vtbl_wchar_utf8 }; const struct mbfl_identify_vtbl vtbl_identify_utf8 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index 41e02bf..7132d9c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -52,7 +52,9 @@ const mbfl_encoding mbfl_encoding_utf8_docomo = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_docomo_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_docomo_wchar, + &vtbl_wchar_utf8_docomo }; const mbfl_encoding mbfl_encoding_utf8_kddi_a = { @@ -61,7 +63,9 @@ const mbfl_encoding mbfl_encoding_utf8_kddi_a = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_kddi_a_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_kddi_a_wchar, + &vtbl_wchar_utf8_kddi_a }; const mbfl_encoding mbfl_encoding_utf8_kddi_b = { @@ -70,7 +74,9 @@ const mbfl_encoding mbfl_encoding_utf8_kddi_b = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_kddi_b_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_kddi_b_wchar, + &vtbl_wchar_utf8_kddi_b }; const mbfl_encoding mbfl_encoding_utf8_sb = { @@ -79,7 +85,9 @@ const mbfl_encoding mbfl_encoding_utf8_sb = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_sb_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_sb_wchar, + &vtbl_wchar_utf8_sb }; const struct mbfl_identify_vtbl vtbl_identify_utf8_docomo = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index b8cdfca..5464fac 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -40,7 +40,9 @@ const mbfl_encoding mbfl_encoding_uuencode = { "x-uuencode", NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_uuencode_8bit = { diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 55c5c1d..8f18525 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -149,7 +149,7 @@ mbfl_buffer_converter_new( /* create convert filter */ convd->filter1 = NULL; convd->filter2 = NULL; - if (mbfl_convert_filter_get_vtbl(convd->from->no_encoding, convd->to->no_encoding) != NULL) { + if (mbfl_convert_filter_get_vtbl(convd->from, convd->to) != NULL) { convd->filter1 = mbfl_convert_filter_new(convd->from, convd->to, mbfl_memory_device_output, NULL, &convd->device); } else { convd->filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, convd->to, mbfl_memory_device_output, NULL, &convd->device); @@ -523,7 +523,7 @@ mbfl_convert_encoding( filter1 = NULL; filter2 = NULL; - if (mbfl_convert_filter_get_vtbl(string->encoding->no_encoding, toenc->no_encoding) != NULL) { + if (mbfl_convert_filter_get_vtbl(string->encoding, toenc) != NULL) { filter1 = mbfl_convert_filter_new(string->encoding, toenc, mbfl_memory_device_output, 0, &device); } else { filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, toenc, mbfl_memory_device_output, 0, &device); diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index ed79746..4faa9b8 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -46,5 +46,7 @@ const mbfl_encoding mbfl_encoding_8bit = { "8bit", (const char *(*)[])&mbfl_encoding_8bit_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + NULL, + NULL }; diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index b19432f..a9c6fd4 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -46,7 +46,9 @@ const mbfl_encoding mbfl_encoding_pass = { NULL, (const char *(*)[])&mbfl_encoding_pass_aliases, NULL, - 0 + 0, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_pass = { diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c index ace81b4..97142a1 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c @@ -44,5 +44,7 @@ const mbfl_encoding mbfl_encoding_wchar = { NULL, NULL, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + NULL, + NULL }; diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 0d9f25d..1f4d81a 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -110,173 +110,6 @@ static char mbfl_hexchar_table[] = { 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,0x45,0x46 }; -/* Input filters going from encoding -> wchar */ -static const struct mbfl_convert_vtbl *mbfl_input_filter_list[] = { - &vtbl_utf8_wchar, - &vtbl_eucjp_wchar, - &vtbl_sjis_wchar, - &vtbl_sjis_open_wchar, - &vtbl_sjis2004_wchar, - &vtbl_cp51932_wchar, - &vtbl_jis_wchar, - &vtbl_jis_ms_wchar, - &vtbl_2022jp_wchar, - &vtbl_2022jpms_wchar, - &vtbl_2022jp_2004_wchar, - &vtbl_2022jp_kddi_wchar, - &vtbl_eucjpwin_wchar, - &vtbl_eucjp2004_wchar, - &vtbl_cp932_wchar, - &vtbl_sjis_docomo_wchar, - &vtbl_sjis_kddi_wchar, - &vtbl_sjis_sb_wchar, - &vtbl_sjis_mac_wchar, - &vtbl_utf8_docomo_wchar, - &vtbl_utf8_kddi_a_wchar, - &vtbl_utf8_kddi_b_wchar, - &vtbl_utf8_sb_wchar, - &vtbl_euccn_wchar, - &vtbl_cp936_wchar, - &vtbl_gb18030_wchar, - &vtbl_hz_wchar, - &vtbl_euctw_wchar, - &vtbl_big5_wchar, - &vtbl_cp950_wchar, - &vtbl_euckr_wchar, - &vtbl_uhc_wchar, - &vtbl_2022kr_wchar, - &vtbl_cp1251_wchar, - &vtbl_cp866_wchar, - &vtbl_koi8r_wchar, - &vtbl_koi8u_wchar, - &vtbl_cp1252_wchar, - &vtbl_cp1254_wchar, - &vtbl_cp50220_wchar, - &vtbl_cp50220raw_wchar, - &vtbl_cp50221_wchar, - &vtbl_cp50222_wchar, - &vtbl_ascii_wchar, - &vtbl_8859_1_wchar, - &vtbl_8859_2_wchar, - &vtbl_8859_3_wchar, - &vtbl_8859_4_wchar, - &vtbl_8859_5_wchar, - &vtbl_8859_6_wchar, - &vtbl_8859_7_wchar, - &vtbl_8859_8_wchar, - &vtbl_8859_9_wchar, - &vtbl_8859_10_wchar, - &vtbl_8859_13_wchar, - &vtbl_8859_14_wchar, - &vtbl_8859_15_wchar, - &vtbl_html_wchar, - &vtbl_utf7_wchar, - &vtbl_utf7imap_wchar, - &vtbl_utf16_wchar, - &vtbl_utf16be_wchar, - &vtbl_utf16le_wchar, - &vtbl_utf32_wchar, - &vtbl_utf32be_wchar, - &vtbl_utf32le_wchar, - &vtbl_ucs4_wchar, - &vtbl_ucs4be_wchar, - &vtbl_ucs4le_wchar, - &vtbl_ucs2_wchar, - &vtbl_ucs2be_wchar, - &vtbl_ucs2le_wchar, - &vtbl_byte4be_wchar, - &vtbl_byte4le_wchar, - &vtbl_byte2be_wchar, - &vtbl_byte2le_wchar, - &vtbl_armscii8_wchar, - &vtbl_cp850_wchar, - NULL -}; - -/* Output filters going from wchar -> encoding */ -static const struct mbfl_convert_vtbl *mbfl_output_filter_list[] = { - &vtbl_wchar_utf8, - &vtbl_wchar_eucjp, - &vtbl_wchar_sjis, - &vtbl_wchar_sjis_open, - &vtbl_wchar_sjis2004, - &vtbl_wchar_cp51932, - &vtbl_wchar_jis, - &vtbl_wchar_jis_ms, - &vtbl_wchar_2022jp, - &vtbl_wchar_2022jpms, - &vtbl_wchar_2022jp_2004, - &vtbl_wchar_2022jp_kddi, - &vtbl_wchar_eucjpwin, - &vtbl_wchar_eucjp2004, - &vtbl_wchar_cp932, - &vtbl_wchar_sjis_docomo, - &vtbl_wchar_sjis_kddi, - &vtbl_wchar_sjis_sb, - &vtbl_wchar_sjis_mac, - &vtbl_wchar_utf8_docomo, - &vtbl_wchar_utf8_kddi_a, - &vtbl_wchar_utf8_kddi_b, - &vtbl_wchar_utf8_sb, - &vtbl_wchar_euccn, - &vtbl_wchar_cp936, - &vtbl_wchar_gb18030, - &vtbl_wchar_hz, - &vtbl_wchar_euctw, - &vtbl_wchar_big5, - &vtbl_wchar_cp950, - &vtbl_wchar_euckr, - &vtbl_wchar_uhc, - &vtbl_wchar_2022kr, - &vtbl_wchar_cp1251, - &vtbl_wchar_cp866, - &vtbl_wchar_koi8r, - &vtbl_wchar_koi8u, - &vtbl_wchar_cp1252, - &vtbl_wchar_cp1254, - &vtbl_wchar_cp50220, - &vtbl_wchar_cp50220raw, - &vtbl_wchar_cp50221, - &vtbl_wchar_cp50222, - &vtbl_wchar_ascii, - &vtbl_wchar_8859_1, - &vtbl_wchar_8859_2, - &vtbl_wchar_8859_3, - &vtbl_wchar_8859_4, - &vtbl_wchar_8859_5, - &vtbl_wchar_8859_6, - &vtbl_wchar_8859_7, - &vtbl_wchar_8859_8, - &vtbl_wchar_8859_9, - &vtbl_wchar_8859_10, - &vtbl_wchar_8859_13, - &vtbl_wchar_8859_14, - &vtbl_wchar_8859_15, - &vtbl_wchar_html, - &vtbl_wchar_utf7, - &vtbl_wchar_utf7imap, - &vtbl_wchar_utf16, - &vtbl_wchar_utf16be, - &vtbl_wchar_utf16le, - &vtbl_wchar_utf32, - &vtbl_wchar_utf32be, - &vtbl_wchar_utf32le, - &vtbl_wchar_ucs4, - &vtbl_wchar_ucs4be, - &vtbl_wchar_ucs4le, - &vtbl_wchar_ucs2, - &vtbl_wchar_ucs2be, - &vtbl_wchar_ucs2le, - &vtbl_wchar_byte4be, - &vtbl_wchar_byte4le, - &vtbl_wchar_byte2be, - &vtbl_wchar_byte2le, - &vtbl_wchar_armscii8, - &vtbl_wchar_cp850, - NULL -}; - -/* Special filters that don't fall in either category */ static const struct mbfl_convert_vtbl *mbfl_special_filter_list[] = { &vtbl_8bit_b64, &vtbl_b64_8bit, @@ -337,7 +170,7 @@ mbfl_convert_filter_new( mbfl_convert_filter * filter; const struct mbfl_convert_vtbl *vtbl; - vtbl = mbfl_convert_filter_get_vtbl(from->no_encoding, to->no_encoding); + vtbl = mbfl_convert_filter_get_vtbl(from, to); if (vtbl == NULL) { vtbl = &vtbl_pass; @@ -420,7 +253,7 @@ void mbfl_convert_filter_reset(mbfl_convert_filter *filter, /* destruct old filter */ (*filter->filter_dtor)(filter); - vtbl = mbfl_convert_filter_get_vtbl(from->no_encoding, to->no_encoding); + vtbl = mbfl_convert_filter_get_vtbl(from, to); if (vtbl == NULL) { vtbl = &vtbl_pass; @@ -597,38 +430,33 @@ mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter) return ret; } -const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encoding from, enum mbfl_no_encoding to) +const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl( + const mbfl_encoding *from, const mbfl_encoding *to) { - const struct mbfl_convert_vtbl *vtbl; - const struct mbfl_convert_vtbl **list; - int i; - - if (to == mbfl_no_encoding_base64 || - to == mbfl_no_encoding_qprint || - to == mbfl_no_encoding_7bit) { - from = mbfl_no_encoding_8bit; - } else if (from == mbfl_no_encoding_base64 || - from == mbfl_no_encoding_qprint || - from == mbfl_no_encoding_uuencode) { - to = mbfl_no_encoding_8bit; + if (to->no_encoding == mbfl_no_encoding_base64 || + to->no_encoding == mbfl_no_encoding_qprint || + to->no_encoding == mbfl_no_encoding_7bit) { + from = &mbfl_encoding_8bit; + } else if (from->no_encoding == mbfl_no_encoding_base64 || + from->no_encoding == mbfl_no_encoding_qprint || + from->no_encoding == mbfl_no_encoding_uuencode) { + to = &mbfl_encoding_8bit; } - if (to == mbfl_no_encoding_wchar) { - list = mbfl_input_filter_list; - } else if (from == mbfl_no_encoding_wchar) { - list = mbfl_output_filter_list; + if (to->no_encoding == mbfl_no_encoding_wchar) { + return from->input_filter; + } else if (from->no_encoding == mbfl_no_encoding_wchar) { + return to->output_filter; } else { - list = mbfl_special_filter_list; - } - - i = 0; - while ((vtbl = list[i++]) != NULL){ - if (vtbl->from == from && vtbl->to == to) { - return vtbl; + int i = 0; + const struct mbfl_convert_vtbl *vtbl; + while ((vtbl = mbfl_special_filter_list[i++]) != NULL){ + if (vtbl->from == from->no_encoding && vtbl->to == to->no_encoding) { + return vtbl; + } } + return NULL; } - - return NULL; } /* diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h index fd0b607..af440be 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h @@ -56,16 +56,6 @@ struct _mbfl_convert_filter { void *opaque; }; -struct mbfl_convert_vtbl { - enum mbfl_no_encoding from; - enum mbfl_no_encoding to; - void (*filter_ctor)(mbfl_convert_filter *filter); - void (*filter_dtor)(mbfl_convert_filter *filter); - int (*filter_function)(int c, mbfl_convert_filter *filter); - int (*filter_flush)(mbfl_convert_filter *filter); - void (*filter_copy)(mbfl_convert_filter *src, mbfl_convert_filter *dest); -}; - MBFLAPI extern mbfl_convert_filter *mbfl_convert_filter_new( const mbfl_encoding *from, const mbfl_encoding *to, @@ -83,7 +73,7 @@ MBFLAPI extern int mbfl_convert_filter_flush(mbfl_convert_filter *filter); MBFLAPI extern void mbfl_convert_filter_reset(mbfl_convert_filter *filter, const mbfl_encoding *from, const mbfl_encoding *to); MBFLAPI extern void mbfl_convert_filter_copy(mbfl_convert_filter *src, mbfl_convert_filter *dist); MBFLAPI extern int mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter); -MBFLAPI extern const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encoding from, enum mbfl_no_encoding to); +MBFLAPI extern const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(const mbfl_encoding *from, const mbfl_encoding *to); MBFLAPI extern void mbfl_filt_conv_common_ctor(mbfl_convert_filter *filter); MBFLAPI extern int mbfl_filt_conv_common_flush(mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index e03c2ac..77c5dae 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -127,7 +127,9 @@ static const mbfl_encoding mbfl_encoding_auto = { NULL, (const char *(*)[])&mbfl_encoding_auto_aliases, NULL, - 0 + 0, + NULL, + NULL }; static const mbfl_encoding *mbfl_encoding_ptr_list[] = { diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h index d080f7b..2952977 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h @@ -128,6 +128,17 @@ enum mbfl_no_encoding { typedef enum mbfl_no_encoding mbfl_encoding_id; +struct _mbfl_convert_filter; +struct mbfl_convert_vtbl { + enum mbfl_no_encoding from; + enum mbfl_no_encoding to; + void (*filter_ctor)(struct _mbfl_convert_filter *filter); + void (*filter_dtor)(struct _mbfl_convert_filter *filter); + int (*filter_function)(int c, struct _mbfl_convert_filter *filter); + int (*filter_flush)(struct _mbfl_convert_filter *filter); + void (*filter_copy)(struct _mbfl_convert_filter *src, struct _mbfl_convert_filter *dest); +}; + /* * encoding */ @@ -138,6 +149,8 @@ typedef struct _mbfl_encoding { const char *(*aliases)[]; const unsigned char *mblen_table; unsigned int flag; + const struct mbfl_convert_vtbl *input_filter; + const struct mbfl_convert_vtbl *output_filter; } mbfl_encoding; MBFLAPI extern const mbfl_encoding * mbfl_name2encoding(const char *name);
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c index ab17271..382c874 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_7bit = { "7bit", NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_8bit_7bit = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c index ad2cf0c..bfe3763 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c @@ -44,7 +44,9 @@ const mbfl_encoding mbfl_encoding_armscii8 = { "ArmSCII-8", (const char *(*)[])&mbfl_encoding_armscii8_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_armscii8_wchar, + &vtbl_wchar_armscii8 }; const struct mbfl_identify_vtbl vtbl_identify_armscii8 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c index e9eb496..b3c1161 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_ascii = { "US-ASCII", /* preferred MIME name */ (const char *(*)[])&mbfl_encoding_ascii_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_ascii_wchar, + &vtbl_wchar_ascii }; const struct mbfl_identify_vtbl vtbl_identify_ascii = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c index adecdee..661e1a4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_base64 = { "BASE64", NULL, NULL, - MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_8bit_b64 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c index 122ff4c..21aac8e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_big5 = { "BIG5", (const char *(*)[])&mbfl_encoding_big5_aliases, mblen_table_big5, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_big5_wchar, + &vtbl_wchar_big5 }; const mbfl_encoding mbfl_encoding_cp950 = { @@ -74,7 +76,9 @@ const mbfl_encoding mbfl_encoding_cp950 = { "BIG5", NULL, mblen_table_big5, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp950_wchar, + &vtbl_wchar_cp950 }; const struct mbfl_identify_vtbl vtbl_identify_big5 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c index 7452c12..9be0fb9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_byte2be = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte2be_wchar, + &vtbl_wchar_byte2be }; const mbfl_encoding mbfl_encoding_byte2le = { @@ -50,7 +52,9 @@ const mbfl_encoding mbfl_encoding_byte2le = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte2le_wchar, + &vtbl_wchar_byte2le }; const struct mbfl_convert_vtbl vtbl_byte2be_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c index 7475e54..46ca04b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_byte4be = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte4be_wchar, + &vtbl_wchar_byte4be }; const mbfl_encoding mbfl_encoding_byte4le = { @@ -50,7 +52,9 @@ const mbfl_encoding mbfl_encoding_byte4le = { NULL, NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_byte4le_wchar, + &vtbl_wchar_byte4le }; const struct mbfl_convert_vtbl vtbl_byte4be_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index a26ce19..532806f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp1251 = { "Windows-1251", (const char *(*)[])&mbfl_encoding_cp1251_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp1251_wchar, + &vtbl_wchar_cp1251 }; const struct mbfl_identify_vtbl vtbl_identify_cp1251 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c index 0c5eba3..6479023 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp1252 = { "Windows-1252", (const char *(*)[])&mbfl_encoding_cp1252_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp1252_wchar, + &vtbl_wchar_cp1252 }; const struct mbfl_identify_vtbl vtbl_identify_cp1252 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c index 78e7933..b01b19f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp1254 = { "Windows-1254", (const char *(*)[])&mbfl_encoding_cp1254_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp1254_wchar, + &vtbl_wchar_cp1254 }; const struct mbfl_identify_vtbl vtbl_identify_cp1254 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c index 75d249f..81b655d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -54,7 +54,9 @@ const mbfl_encoding mbfl_encoding_jis_ms = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_jis_ms_wchar, + &vtbl_wchar_jis_ms }; const mbfl_encoding mbfl_encoding_cp50220 = { @@ -63,7 +65,9 @@ const mbfl_encoding mbfl_encoding_cp50220 = { "ISO-2022-JP", (const char *(*)[])NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50220_wchar, + &vtbl_wchar_cp50220 }; const mbfl_encoding mbfl_encoding_cp50220raw = { @@ -72,7 +76,9 @@ const mbfl_encoding mbfl_encoding_cp50220raw = { "ISO-2022-JP", (const char *(*)[])NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50220raw_wchar, + &vtbl_wchar_cp50220raw }; const mbfl_encoding mbfl_encoding_cp50221 = { @@ -81,7 +87,9 @@ const mbfl_encoding mbfl_encoding_cp50221 = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50221_wchar, + &vtbl_wchar_cp50221 }; const mbfl_encoding mbfl_encoding_cp50222 = { @@ -90,7 +98,9 @@ const mbfl_encoding mbfl_encoding_cp50222 = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp50222_wchar, + &vtbl_wchar_cp50222 }; const struct mbfl_identify_vtbl vtbl_identify_jis_ms = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index aae4538..057d6c6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -75,7 +75,9 @@ const mbfl_encoding mbfl_encoding_cp51932 = { "CP51932", (const char *(*)[])&mbfl_encoding_cp51932_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_cp51932_wchar, + &vtbl_wchar_cp51932 }; const struct mbfl_convert_vtbl vtbl_cp51932_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c index 179873e..25ec247 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -41,7 +41,9 @@ const mbfl_encoding mbfl_encoding_cp850 = { "CP850", (const char *(*)[])&mbfl_encoding_cp850_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp850_wchar, + &vtbl_wchar_cp850 }; const struct mbfl_identify_vtbl vtbl_identify_cp850 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c index 307f370..95b6812 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_cp866 = { "CP866", (const char *(*)[])&mbfl_encoding_cp866_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_cp866_wchar, + &vtbl_wchar_cp866 }; const struct mbfl_identify_vtbl vtbl_identify_cp866 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c index 4063a68..e6cbd5f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -66,7 +66,9 @@ const mbfl_encoding mbfl_encoding_cp932 = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_cp932_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp932_wchar, + &vtbl_wchar_cp932 }; const struct mbfl_identify_vtbl vtbl_identify_cp932 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c index 23e3a1d..047eb62 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_cp936 = { "CP936", (const char *(*)[])&mbfl_encoding_cp936_aliases, mblen_table_cp936, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_cp936_wchar, + &vtbl_wchar_cp936 }; const struct mbfl_identify_vtbl vtbl_identify_cp936 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c index bf3ec25..7fd3d7c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_euc_cn = { "CN-GB", (const char *(*)[])&mbfl_encoding_euc_cn_aliases, mblen_table_euccn, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_euccn_wchar, + &vtbl_wchar_euccn }; const struct mbfl_identify_vtbl vtbl_identify_euccn = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c index 3b13850..ba79493 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -66,7 +66,9 @@ const mbfl_encoding mbfl_encoding_euc_jp = { "EUC-JP", (const char *(*)[])&mbfl_encoding_euc_jp_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_eucjp_wchar, + &vtbl_wchar_eucjp }; const struct mbfl_identify_vtbl vtbl_identify_eucjp = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c index aeb94c3..2fe24e0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -48,7 +48,9 @@ const mbfl_encoding mbfl_encoding_eucjp2004 = { "EUC-JP", (const char *(*)[])&mbfl_encoding_eucjp2004_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_eucjp2004_wchar, + &vtbl_wchar_eucjp2004 }; const struct mbfl_identify_vtbl vtbl_identify_eucjp2004 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c index 95aec45..912ae73 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -76,7 +76,9 @@ const mbfl_encoding mbfl_encoding_eucjp_win = { "EUC-JP", (const char *(*)[])&mbfl_encoding_eucjp_win_aliases, mblen_table_eucjp, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_eucjpwin_wchar, + &vtbl_wchar_eucjpwin }; const struct mbfl_convert_vtbl vtbl_eucjpwin_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c index 2a537ad..ee8dc92 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c @@ -64,7 +64,9 @@ const mbfl_encoding mbfl_encoding_euc_kr = { "EUC-KR", (const char *(*)[])&mbfl_encoding_euc_kr_aliases, mblen_table_euckr, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_euckr_wchar, + &vtbl_wchar_euckr }; const struct mbfl_identify_vtbl vtbl_identify_euckr = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index 721c162..b7687b6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -47,7 +47,9 @@ const mbfl_encoding mbfl_encoding_gb18030 = { "GB18030", (const char *(*)[])&mbfl_encoding_gb18030_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_gb18030_wchar, + &vtbl_wchar_gb18030 }; const struct mbfl_identify_vtbl vtbl_identify_gb18030 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c index 03b26cc..12ff178 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c @@ -70,7 +70,9 @@ const mbfl_encoding mbfl_encoding_html_ent = { "HTML-ENTITIES", (const char *(*)[])&mbfl_encoding_html_ent_aliases, NULL, - MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_html_wchar, + &vtbl_wchar_html }; const struct mbfl_convert_vtbl vtbl_wchar_html = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.c b/ext/mbstring/libmbfl/filters/mbfilter_hz.c index a3422cd..8a39b75 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_hz.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.c @@ -44,7 +44,9 @@ const mbfl_encoding mbfl_encoding_hz = { "HZ-GB-2312", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_hz_wchar, + &vtbl_wchar_hz }; const struct mbfl_identify_vtbl vtbl_identify_hz = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c index 1f26d17..4e8b974 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c @@ -48,7 +48,9 @@ const mbfl_encoding mbfl_encoding_2022jpms = { "ISO-2022-JP", (const char *(*)[])&mbfl_encoding_2022jpms_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jpms_wchar, + &vtbl_wchar_2022jpms }; const struct mbfl_identify_vtbl vtbl_identify_2022jpms = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c index 501bcb8..c1fe9f1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_2022kr = { "ISO-2022-KR", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022kr_wchar, + &vtbl_wchar_2022kr }; const struct mbfl_identify_vtbl vtbl_identify_2022kr = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c index fc6678e..17355bf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -47,7 +47,9 @@ const mbfl_encoding mbfl_encoding_2022jp_2004 = { "ISO-2022-JP-2004", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jp_2004_wchar, + &vtbl_wchar_2022jp_2004 }; const struct mbfl_identify_vtbl vtbl_identify_2022jp_2004 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c index e0d5543..3847f78 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c @@ -50,7 +50,9 @@ const mbfl_encoding mbfl_encoding_2022jp_kddi = { "ISO-2022-JP", &mbfl_encoding_2022jp_kddi_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jp_kddi_wchar, + &vtbl_wchar_2022jp_kddi }; const struct mbfl_identify_vtbl vtbl_identify_2022jp_kddi = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c index 382d0c2..239d74e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_8859_1 = { "ISO-8859-1", (const char *(*)[])&mbfl_encoding_8859_1_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_1_wchar, + &vtbl_wchar_8859_1 }; const struct mbfl_identify_vtbl vtbl_identify_8859_1 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c index f6d1b21..0fb6bc8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_10 = { "ISO-8859-10", (const char *(*)[])&mbfl_encoding_8859_10_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_10_wchar, + &vtbl_wchar_8859_10 }; const struct mbfl_identify_vtbl vtbl_identify_8859_10 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c index cbc8f77..2b2494b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_13 = { "ISO-8859-13", (const char *(*)[])&mbfl_encoding_8859_13_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_13_wchar, + &vtbl_wchar_8859_13 }; const struct mbfl_identify_vtbl vtbl_identify_8859_13 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c index 03581cc..eb008b8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_14 = { "ISO-8859-14", (const char *(*)[])&mbfl_encoding_8859_14_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_14_wchar, + &vtbl_wchar_8859_14 }; const struct mbfl_identify_vtbl vtbl_identify_8859_14 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c index 25323bd..74e5a2d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_15 = { "ISO-8859-15", (const char *(*)[])&mbfl_encoding_8859_15_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_15_wchar, + &vtbl_wchar_8859_15 }; const struct mbfl_identify_vtbl vtbl_identify_8859_15 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c index 1bd5f8a..68da24f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_16 = { "ISO-8859-16", (const char *(*)[])&mbfl_encoding_8859_16_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_16_wchar, + &vtbl_wchar_8859_16 }; const struct mbfl_identify_vtbl vtbl_identify_8859_16 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c index 50649dd..ec1b2bc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_2 = { "ISO-8859-2", (const char *(*)[])&mbfl_encoding_8859_2_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_2_wchar, + &vtbl_wchar_8859_2 }; const struct mbfl_identify_vtbl vtbl_identify_8859_2 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c index e189706..f3905ac 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_3 = { "ISO-8859-3", (const char *(*)[])&mbfl_encoding_8859_3_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_3_wchar, + &vtbl_wchar_8859_3 }; const struct mbfl_identify_vtbl vtbl_identify_8859_3 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c index a04910e..19e105a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_4 = { "ISO-8859-4", (const char *(*)[])&mbfl_encoding_8859_4_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_4_wchar, + &vtbl_wchar_8859_4 }; const struct mbfl_identify_vtbl vtbl_identify_8859_4 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c index 0bd4d5e..ac3b2d2 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_5 = { "ISO-8859-5", (const char *(*)[])&mbfl_encoding_8859_5_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_5_wchar, + &vtbl_wchar_8859_5 }; const struct mbfl_identify_vtbl vtbl_identify_8859_5 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c index df89eb7..c5bbdd7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_6 = { "ISO-8859-6", (const char *(*)[])&mbfl_encoding_8859_6_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_6_wchar, + &vtbl_wchar_8859_6 }; const struct mbfl_identify_vtbl vtbl_identify_8859_6 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c index d8d4494..98ffade 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_7 = { "ISO-8859-7", (const char *(*)[])&mbfl_encoding_8859_7_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_7_wchar, + &vtbl_wchar_8859_7 }; const struct mbfl_identify_vtbl vtbl_identify_8859_7 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c index fad0f5c..3d65ce6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_8 = { "ISO-8859-8", (const char *(*)[])&mbfl_encoding_8859_8_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_8_wchar, + &vtbl_wchar_8859_8 }; const struct mbfl_identify_vtbl vtbl_identify_8859_8 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c index 97948d0..8a730ae 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_8859_9 = { "ISO-8859-9", (const char *(*)[])&mbfl_encoding_8859_9_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_8859_9_wchar, + &vtbl_wchar_8859_9 }; const struct mbfl_identify_vtbl vtbl_identify_8859_9 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c index b3fbb4f..88395cb 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -46,7 +46,9 @@ const mbfl_encoding mbfl_encoding_jis = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_jis_wchar, + &vtbl_wchar_jis }; const mbfl_encoding mbfl_encoding_2022jp = { @@ -55,7 +57,9 @@ const mbfl_encoding mbfl_encoding_2022jp = { "ISO-2022-JP", NULL, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_2022jp_wchar, + &vtbl_wchar_2022jp }; const struct mbfl_identify_vtbl vtbl_identify_jis = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c index e35a025..101b3f1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c @@ -45,7 +45,9 @@ const mbfl_encoding mbfl_encoding_koi8r = { "KOI8-R", (const char *(*)[])&mbfl_encoding_koi8r_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_koi8r_wchar, + &vtbl_wchar_koi8r }; const struct mbfl_identify_vtbl vtbl_identify_koi8r = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c index 4dfc686..2517432 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_koi8u = { "KOI8-U", (const char *(*)[])&mbfl_encoding_koi8u_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + &vtbl_koi8u_wchar, + &vtbl_wchar_koi8u }; const struct mbfl_identify_vtbl vtbl_identify_koi8u = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index c141dc4..b72724f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -43,7 +43,9 @@ const mbfl_encoding mbfl_encoding_qprint = { "Quoted-Printable", (const char *(*)[])&mbfl_encoding_qprint_aliases, NULL, - MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_8bit_qprint = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c index 782e0df..33b1e1f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -69,7 +69,9 @@ const mbfl_encoding mbfl_encoding_sjis = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_wchar, + &vtbl_wchar_sjis }; const struct mbfl_identify_vtbl vtbl_identify_sjis = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c index 4f146ce..dd37bba 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c @@ -53,7 +53,9 @@ const mbfl_encoding mbfl_encoding_sjis2004 = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis2004_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis2004_wchar, + &vtbl_wchar_sjis2004 }; const struct mbfl_identify_vtbl vtbl_identify_sjis2004 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c index 2087786..ff08cf3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -52,7 +52,9 @@ const mbfl_encoding mbfl_encoding_sjis_mac = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_mac_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_mac_wchar, + &vtbl_wchar_sjis_mac }; const struct mbfl_identify_vtbl vtbl_identify_sjis_mac = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index a856aa3..ca3d437 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -54,7 +54,9 @@ const mbfl_encoding mbfl_encoding_sjis_docomo = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_docomo_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_docomo_wchar, + &vtbl_wchar_sjis_docomo }; const mbfl_encoding mbfl_encoding_sjis_kddi = { @@ -63,7 +65,9 @@ const mbfl_encoding mbfl_encoding_sjis_kddi = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_kddi_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_kddi_wchar, + &vtbl_wchar_sjis_kddi }; const mbfl_encoding mbfl_encoding_sjis_sb = { @@ -72,7 +76,9 @@ const mbfl_encoding mbfl_encoding_sjis_sb = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_sb_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_sb_wchar, + &vtbl_wchar_sjis_sb }; const struct mbfl_identify_vtbl vtbl_identify_sjis_docomo = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c index 265c577..17e7879 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -66,7 +66,9 @@ const mbfl_encoding mbfl_encoding_sjis_open = { "Shift_JIS", (const char *(*)[])&mbfl_encoding_sjis_open_aliases, mblen_table_sjis, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_sjis_open_wchar, + &vtbl_wchar_sjis_open }; const struct mbfl_identify_vtbl vtbl_identify_sjis_open = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c index 32f174f..08cbf6d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_ucs2 = { "UCS-2", (const char *(*)[])&mbfl_encoding_ucs2_aliases, NULL, - MBFL_ENCTYPE_WCS2BE + MBFL_ENCTYPE_WCS2BE, + &vtbl_ucs2_wchar, + &vtbl_wchar_ucs2 }; const mbfl_encoding mbfl_encoding_ucs2be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_ucs2be = { "UCS-2BE", NULL, NULL, - MBFL_ENCTYPE_WCS2BE + MBFL_ENCTYPE_WCS2BE, + &vtbl_ucs2be_wchar, + &vtbl_wchar_ucs2be }; const mbfl_encoding mbfl_encoding_ucs2le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_ucs2le = { "UCS-2LE", NULL, NULL, - MBFL_ENCTYPE_WCS2LE + MBFL_ENCTYPE_WCS2LE, + &vtbl_ucs2le_wchar, + &vtbl_wchar_ucs2le }; const struct mbfl_convert_vtbl vtbl_ucs2_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c index 8906b8f..011c93f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_ucs4 = { "UCS-4", (const char *(*)[])&mbfl_encoding_ucs4_aliases, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_ucs4_wchar, + &vtbl_wchar_ucs4 }; const mbfl_encoding mbfl_encoding_ucs4be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_ucs4be = { "UCS-4BE", NULL, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_ucs4be_wchar, + &vtbl_wchar_ucs4be }; const mbfl_encoding mbfl_encoding_ucs4le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_ucs4le = { "UCS-4LE", NULL, NULL, - MBFL_ENCTYPE_WCS4LE + MBFL_ENCTYPE_WCS4LE, + &vtbl_ucs4le_wchar, + &vtbl_wchar_ucs4le }; const struct mbfl_convert_vtbl vtbl_ucs4_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c index 2e1c696..1603793 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -65,7 +65,9 @@ const mbfl_encoding mbfl_encoding_uhc = { "UHC", (const char *(*)[])&mbfl_encoding_uhc_aliases, mblen_table_uhc, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_uhc_wchar, + &vtbl_wchar_uhc }; const struct mbfl_identify_vtbl vtbl_identify_uhc = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c index 3e008e8..a4864cd 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_utf16 = { "UTF-16", (const char *(*)[])&mbfl_encoding_utf16_aliases, NULL, - MBFL_ENCTYPE_MWC2BE + MBFL_ENCTYPE_MWC2BE, + &vtbl_utf16_wchar, + &vtbl_wchar_utf16 }; const mbfl_encoding mbfl_encoding_utf16be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_utf16be = { "UTF-16BE", NULL, NULL, - MBFL_ENCTYPE_MWC2BE + MBFL_ENCTYPE_MWC2BE, + &vtbl_utf16be_wchar, + &vtbl_wchar_utf16be }; const mbfl_encoding mbfl_encoding_utf16le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_utf16le = { "UTF-16LE", NULL, NULL, - MBFL_ENCTYPE_MWC2LE + MBFL_ENCTYPE_MWC2LE, + &vtbl_utf16le_wchar, + &vtbl_wchar_utf16le }; const struct mbfl_convert_vtbl vtbl_utf16_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c index 852bca2..5b02362 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c @@ -42,7 +42,9 @@ const mbfl_encoding mbfl_encoding_utf32 = { "UTF-32", (const char *(*)[])&mbfl_encoding_utf32_aliases, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_utf32_wchar, + &vtbl_wchar_utf32 }; const mbfl_encoding mbfl_encoding_utf32be = { @@ -51,7 +53,9 @@ const mbfl_encoding mbfl_encoding_utf32be = { "UTF-32BE", NULL, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + &vtbl_utf32be_wchar, + &vtbl_wchar_utf32be }; const mbfl_encoding mbfl_encoding_utf32le = { @@ -60,7 +64,9 @@ const mbfl_encoding mbfl_encoding_utf32le = { "UTF-32LE", NULL, NULL, - MBFL_ENCTYPE_WCS4LE + MBFL_ENCTYPE_WCS4LE, + &vtbl_utf32le_wchar, + &vtbl_wchar_utf32le }; const struct mbfl_convert_vtbl vtbl_utf32_wchar = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c index db0979c..f31da86 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -57,7 +57,9 @@ const mbfl_encoding mbfl_encoding_utf7 = { "UTF-7", (const char *(*)[])&mbfl_encoding_utf7_aliases, NULL, - MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE + MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE, + &vtbl_utf7_wchar, + &vtbl_wchar_utf7 }; const struct mbfl_identify_vtbl vtbl_identify_utf7 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c index e81e086..1e2ad5b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c @@ -63,7 +63,9 @@ const mbfl_encoding mbfl_encoding_utf8 = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_wchar, + &vtbl_wchar_utf8 }; const struct mbfl_identify_vtbl vtbl_identify_utf8 = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index 41e02bf..7132d9c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -52,7 +52,9 @@ const mbfl_encoding mbfl_encoding_utf8_docomo = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_docomo_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_docomo_wchar, + &vtbl_wchar_utf8_docomo }; const mbfl_encoding mbfl_encoding_utf8_kddi_a = { @@ -61,7 +63,9 @@ const mbfl_encoding mbfl_encoding_utf8_kddi_a = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_kddi_a_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_kddi_a_wchar, + &vtbl_wchar_utf8_kddi_a }; const mbfl_encoding mbfl_encoding_utf8_kddi_b = { @@ -70,7 +74,9 @@ const mbfl_encoding mbfl_encoding_utf8_kddi_b = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_kddi_b_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_kddi_b_wchar, + &vtbl_wchar_utf8_kddi_b }; const mbfl_encoding mbfl_encoding_utf8_sb = { @@ -79,7 +85,9 @@ const mbfl_encoding mbfl_encoding_utf8_sb = { "UTF-8", (const char *(*)[])&mbfl_encoding_utf8_sb_aliases, mblen_table_utf8, - MBFL_ENCTYPE_MBCS + MBFL_ENCTYPE_MBCS, + &vtbl_utf8_sb_wchar, + &vtbl_wchar_utf8_sb }; const struct mbfl_identify_vtbl vtbl_identify_utf8_docomo = { diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index b8cdfca..5464fac 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -40,7 +40,9 @@ const mbfl_encoding mbfl_encoding_uuencode = { "x-uuencode", NULL, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_uuencode_8bit = { diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 55c5c1d..8f18525 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -149,7 +149,7 @@ mbfl_buffer_converter_new( /* create convert filter */ convd->filter1 = NULL; convd->filter2 = NULL; - if (mbfl_convert_filter_get_vtbl(convd->from->no_encoding, convd->to->no_encoding) != NULL) { + if (mbfl_convert_filter_get_vtbl(convd->from, convd->to) != NULL) { convd->filter1 = mbfl_convert_filter_new(convd->from, convd->to, mbfl_memory_device_output, NULL, &convd->device); } else { convd->filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, convd->to, mbfl_memory_device_output, NULL, &convd->device); @@ -523,7 +523,7 @@ mbfl_convert_encoding( filter1 = NULL; filter2 = NULL; - if (mbfl_convert_filter_get_vtbl(string->encoding->no_encoding, toenc->no_encoding) != NULL) { + if (mbfl_convert_filter_get_vtbl(string->encoding, toenc) != NULL) { filter1 = mbfl_convert_filter_new(string->encoding, toenc, mbfl_memory_device_output, 0, &device); } else { filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, toenc, mbfl_memory_device_output, 0, &device); diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index ed79746..4faa9b8 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -46,5 +46,7 @@ const mbfl_encoding mbfl_encoding_8bit = { "8bit", (const char *(*)[])&mbfl_encoding_8bit_aliases, NULL, - MBFL_ENCTYPE_SBCS + MBFL_ENCTYPE_SBCS, + NULL, + NULL }; diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index b19432f..a9c6fd4 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -46,7 +46,9 @@ const mbfl_encoding mbfl_encoding_pass = { NULL, (const char *(*)[])&mbfl_encoding_pass_aliases, NULL, - 0 + 0, + NULL, + NULL }; const struct mbfl_convert_vtbl vtbl_pass = { diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c index ace81b4..97142a1 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c @@ -44,5 +44,7 @@ const mbfl_encoding mbfl_encoding_wchar = { NULL, NULL, NULL, - MBFL_ENCTYPE_WCS4BE + MBFL_ENCTYPE_WCS4BE, + NULL, + NULL }; diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 0d9f25d..1f4d81a 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -110,173 +110,6 @@ static char mbfl_hexchar_table[] = { 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,0x45,0x46 }; -/* Input filters going from encoding -> wchar */ -static const struct mbfl_convert_vtbl *mbfl_input_filter_list[] = { - &vtbl_utf8_wchar, - &vtbl_eucjp_wchar, - &vtbl_sjis_wchar, - &vtbl_sjis_open_wchar, - &vtbl_sjis2004_wchar, - &vtbl_cp51932_wchar, - &vtbl_jis_wchar, - &vtbl_jis_ms_wchar, - &vtbl_2022jp_wchar, - &vtbl_2022jpms_wchar, - &vtbl_2022jp_2004_wchar, - &vtbl_2022jp_kddi_wchar, - &vtbl_eucjpwin_wchar, - &vtbl_eucjp2004_wchar, - &vtbl_cp932_wchar, - &vtbl_sjis_docomo_wchar, - &vtbl_sjis_kddi_wchar, - &vtbl_sjis_sb_wchar, - &vtbl_sjis_mac_wchar, - &vtbl_utf8_docomo_wchar, - &vtbl_utf8_kddi_a_wchar, - &vtbl_utf8_kddi_b_wchar, - &vtbl_utf8_sb_wchar, - &vtbl_euccn_wchar, - &vtbl_cp936_wchar, - &vtbl_gb18030_wchar, - &vtbl_hz_wchar, - &vtbl_euctw_wchar, - &vtbl_big5_wchar, - &vtbl_cp950_wchar, - &vtbl_euckr_wchar, - &vtbl_uhc_wchar, - &vtbl_2022kr_wchar, - &vtbl_cp1251_wchar, - &vtbl_cp866_wchar, - &vtbl_koi8r_wchar, - &vtbl_koi8u_wchar, - &vtbl_cp1252_wchar, - &vtbl_cp1254_wchar, - &vtbl_cp50220_wchar, - &vtbl_cp50220raw_wchar, - &vtbl_cp50221_wchar, - &vtbl_cp50222_wchar, - &vtbl_ascii_wchar, - &vtbl_8859_1_wchar, - &vtbl_8859_2_wchar, - &vtbl_8859_3_wchar, - &vtbl_8859_4_wchar, - &vtbl_8859_5_wchar, - &vtbl_8859_6_wchar, - &vtbl_8859_7_wchar, - &vtbl_8859_8_wchar, - &vtbl_8859_9_wchar, - &vtbl_8859_10_wchar, - &vtbl_8859_13_wchar, - &vtbl_8859_14_wchar, - &vtbl_8859_15_wchar, - &vtbl_html_wchar, - &vtbl_utf7_wchar, - &vtbl_utf7imap_wchar, - &vtbl_utf16_wchar, - &vtbl_utf16be_wchar, - &vtbl_utf16le_wchar, - &vtbl_utf32_wchar, - &vtbl_utf32be_wchar, - &vtbl_utf32le_wchar, - &vtbl_ucs4_wchar, - &vtbl_ucs4be_wchar, - &vtbl_ucs4le_wchar, - &vtbl_ucs2_wchar, - &vtbl_ucs2be_wchar, - &vtbl_ucs2le_wchar, - &vtbl_byte4be_wchar, - &vtbl_byte4le_wchar, - &vtbl_byte2be_wchar, - &vtbl_byte2le_wchar, - &vtbl_armscii8_wchar, - &vtbl_cp850_wchar, - NULL -}; - -/* Output filters going from wchar -> encoding */ -static const struct mbfl_convert_vtbl *mbfl_output_filter_list[] = { - &vtbl_wchar_utf8, - &vtbl_wchar_eucjp, - &vtbl_wchar_sjis, - &vtbl_wchar_sjis_open, - &vtbl_wchar_sjis2004, - &vtbl_wchar_cp51932, - &vtbl_wchar_jis, - &vtbl_wchar_jis_ms, - &vtbl_wchar_2022jp, - &vtbl_wchar_2022jpms, - &vtbl_wchar_2022jp_2004, - &vtbl_wchar_2022jp_kddi, - &vtbl_wchar_eucjpwin, - &vtbl_wchar_eucjp2004, - &vtbl_wchar_cp932, - &vtbl_wchar_sjis_docomo, - &vtbl_wchar_sjis_kddi, - &vtbl_wchar_sjis_sb, - &vtbl_wchar_sjis_mac, - &vtbl_wchar_utf8_docomo, - &vtbl_wchar_utf8_kddi_a, - &vtbl_wchar_utf8_kddi_b, - &vtbl_wchar_utf8_sb, - &vtbl_wchar_euccn, - &vtbl_wchar_cp936, - &vtbl_wchar_gb18030, - &vtbl_wchar_hz, - &vtbl_wchar_euctw, - &vtbl_wchar_big5, - &vtbl_wchar_cp950, - &vtbl_wchar_euckr, - &vtbl_wchar_uhc, - &vtbl_wchar_2022kr, - &vtbl_wchar_cp1251, - &vtbl_wchar_cp866, - &vtbl_wchar_koi8r, - &vtbl_wchar_koi8u, - &vtbl_wchar_cp1252, - &vtbl_wchar_cp1254, - &vtbl_wchar_cp50220, - &vtbl_wchar_cp50220raw, - &vtbl_wchar_cp50221, - &vtbl_wchar_cp50222, - &vtbl_wchar_ascii, - &vtbl_wchar_8859_1, - &vtbl_wchar_8859_2, - &vtbl_wchar_8859_3, - &vtbl_wchar_8859_4, - &vtbl_wchar_8859_5, - &vtbl_wchar_8859_6, - &vtbl_wchar_8859_7, - &vtbl_wchar_8859_8, - &vtbl_wchar_8859_9, - &vtbl_wchar_8859_10, - &vtbl_wchar_8859_13, - &vtbl_wchar_8859_14, - &vtbl_wchar_8859_15, - &vtbl_wchar_html, - &vtbl_wchar_utf7, - &vtbl_wchar_utf7imap, - &vtbl_wchar_utf16, - &vtbl_wchar_utf16be, - &vtbl_wchar_utf16le, - &vtbl_wchar_utf32, - &vtbl_wchar_utf32be, - &vtbl_wchar_utf32le, - &vtbl_wchar_ucs4, - &vtbl_wchar_ucs4be, - &vtbl_wchar_ucs4le, - &vtbl_wchar_ucs2, - &vtbl_wchar_ucs2be, - &vtbl_wchar_ucs2le, - &vtbl_wchar_byte4be, - &vtbl_wchar_byte4le, - &vtbl_wchar_byte2be, - &vtbl_wchar_byte2le, - &vtbl_wchar_armscii8, - &vtbl_wchar_cp850, - NULL -}; - -/* Special filters that don't fall in either category */ static const struct mbfl_convert_vtbl *mbfl_special_filter_list[] = { &vtbl_8bit_b64, &vtbl_b64_8bit, @@ -337,7 +170,7 @@ mbfl_convert_filter_new( mbfl_convert_filter * filter; const struct mbfl_convert_vtbl *vtbl; - vtbl = mbfl_convert_filter_get_vtbl(from->no_encoding, to->no_encoding); + vtbl = mbfl_convert_filter_get_vtbl(from, to); if (vtbl == NULL) { vtbl = &vtbl_pass; @@ -420,7 +253,7 @@ void mbfl_convert_filter_reset(mbfl_convert_filter *filter, /* destruct old filter */ (*filter->filter_dtor)(filter); - vtbl = mbfl_convert_filter_get_vtbl(from->no_encoding, to->no_encoding); + vtbl = mbfl_convert_filter_get_vtbl(from, to); if (vtbl == NULL) { vtbl = &vtbl_pass; @@ -597,38 +430,33 @@ mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter) return ret; } -const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encoding from, enum mbfl_no_encoding to) +const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl( + const mbfl_encoding *from, const mbfl_encoding *to) { - const struct mbfl_convert_vtbl *vtbl; - const struct mbfl_convert_vtbl **list; - int i; - - if (to == mbfl_no_encoding_base64 || - to == mbfl_no_encoding_qprint || - to == mbfl_no_encoding_7bit) { - from = mbfl_no_encoding_8bit; - } else if (from == mbfl_no_encoding_base64 || - from == mbfl_no_encoding_qprint || - from == mbfl_no_encoding_uuencode) { - to = mbfl_no_encoding_8bit; + if (to->no_encoding == mbfl_no_encoding_base64 || + to->no_encoding == mbfl_no_encoding_qprint || + to->no_encoding == mbfl_no_encoding_7bit) { + from = &mbfl_encoding_8bit; + } else if (from->no_encoding == mbfl_no_encoding_base64 || + from->no_encoding == mbfl_no_encoding_qprint || + from->no_encoding == mbfl_no_encoding_uuencode) { + to = &mbfl_encoding_8bit; } - if (to == mbfl_no_encoding_wchar) { - list = mbfl_input_filter_list; - } else if (from == mbfl_no_encoding_wchar) { - list = mbfl_output_filter_list; + if (to->no_encoding == mbfl_no_encoding_wchar) { + return from->input_filter; + } else if (from->no_encoding == mbfl_no_encoding_wchar) { + return to->output_filter; } else { - list = mbfl_special_filter_list; - } - - i = 0; - while ((vtbl = list[i++]) != NULL){ - if (vtbl->from == from && vtbl->to == to) { - return vtbl; + int i = 0; + const struct mbfl_convert_vtbl *vtbl; + while ((vtbl = mbfl_special_filter_list[i++]) != NULL){ + if (vtbl->from == from->no_encoding && vtbl->to == to->no_encoding) { + return vtbl; + } } + return NULL; } - - return NULL; } /* diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h index fd0b607..af440be 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h @@ -56,16 +56,6 @@ struct _mbfl_convert_filter { void *opaque; }; -struct mbfl_convert_vtbl { - enum mbfl_no_encoding from; - enum mbfl_no_encoding to; - void (*filter_ctor)(mbfl_convert_filter *filter); - void (*filter_dtor)(mbfl_convert_filter *filter); - int (*filter_function)(int c, mbfl_convert_filter *filter); - int (*filter_flush)(mbfl_convert_filter *filter); - void (*filter_copy)(mbfl_convert_filter *src, mbfl_convert_filter *dest); -}; - MBFLAPI extern mbfl_convert_filter *mbfl_convert_filter_new( const mbfl_encoding *from, const mbfl_encoding *to, @@ -83,7 +73,7 @@ MBFLAPI extern int mbfl_convert_filter_flush(mbfl_convert_filter *filter); MBFLAPI extern void mbfl_convert_filter_reset(mbfl_convert_filter *filter, const mbfl_encoding *from, const mbfl_encoding *to); MBFLAPI extern void mbfl_convert_filter_copy(mbfl_convert_filter *src, mbfl_convert_filter *dist); MBFLAPI extern int mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter); -MBFLAPI extern const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encoding from, enum mbfl_no_encoding to); +MBFLAPI extern const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(const mbfl_encoding *from, const mbfl_encoding *to); MBFLAPI extern void mbfl_filt_conv_common_ctor(mbfl_convert_filter *filter); MBFLAPI extern int mbfl_filt_conv_common_flush(mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index e03c2ac..77c5dae 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -127,7 +127,9 @@ static const mbfl_encoding mbfl_encoding_auto = { NULL, (const char *(*)[])&mbfl_encoding_auto_aliases, NULL, - 0 + 0, + NULL, + NULL }; static const mbfl_encoding *mbfl_encoding_ptr_list[] = { diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h index d080f7b..2952977 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h @@ -128,6 +128,17 @@ enum mbfl_no_encoding { typedef enum mbfl_no_encoding mbfl_encoding_id; +struct _mbfl_convert_filter; +struct mbfl_convert_vtbl { + enum mbfl_no_encoding from; + enum mbfl_no_encoding to; + void (*filter_ctor)(struct _mbfl_convert_filter *filter); + void (*filter_dtor)(struct _mbfl_convert_filter *filter); + int (*filter_function)(int c, struct _mbfl_convert_filter *filter); + int (*filter_flush)(struct _mbfl_convert_filter *filter); + void (*filter_copy)(struct _mbfl_convert_filter *src, struct _mbfl_convert_filter *dest); +}; + /* * encoding */ @@ -138,6 +149,8 @@ typedef struct _mbfl_encoding { const char *(*aliases)[]; const unsigned char *mblen_table; unsigned int flag; + const struct mbfl_convert_vtbl *input_filter; + const struct mbfl_convert_vtbl *output_filter; } mbfl_encoding; MBFLAPI extern const mbfl_encoding * mbfl_name2encoding(const char *name);