diff options
| author | Alex Dowad <alexinbeijing@gmail.com> | 2020-07-16 09:15:56 +0200 |
|---|---|---|
| committer | Alex Dowad <alexinbeijing@gmail.com> | 2020-09-03 15:56:29 +0200 |
| commit | dcd6c6043eff310ac160551ffeeaa905c7e26aa5 (patch) | |
| tree | 35b91f73c2457a35a5a20081821f2e43b9099cc1 /ext | |
| parent | 409aa20ab0f1c4673366b2cbfc4d618e710ff7bf (diff) | |
| download | php-git-dcd6c6043eff310ac160551ffeeaa905c7e26aa5.tar.gz | |
Remove unneeded function mbfl_filt_conv_common_dtor
This is a default destructor for mbfl_convert_filter structs. The thing is: there
isn't really anything that needs to be done to those structs before freeing them.
The default destructor just zeroed out some fields, but there's no reason why
we should actually do that.
Diffstat (limited to 'ext')
69 files changed, 214 insertions, 208 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c index 451860f435..42ed23326d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -46,7 +46,7 @@ const struct mbfl_convert_vtbl vtbl_8bit_7bit = { mbfl_no_encoding_8bit, mbfl_no_encoding_7bit, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_any_7bit, mbfl_filt_conv_common_flush, NULL, @@ -56,7 +56,7 @@ const struct mbfl_convert_vtbl vtbl_7bit_8bit = { mbfl_no_encoding_7bit, mbfl_no_encoding_8bit, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_7bit_any, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c index 697e37dee9..e168176cc0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c @@ -56,7 +56,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_armscii8 = { mbfl_no_encoding_wchar, mbfl_no_encoding_armscii8, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_armscii8, mbfl_filt_conv_common_flush, NULL, @@ -66,7 +66,7 @@ const struct mbfl_convert_vtbl vtbl_armscii8_wchar = { mbfl_no_encoding_armscii8, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_armscii8_wchar, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c index 489f1deea3..a1e9533bc8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_ascii_wchar = { mbfl_no_encoding_ascii, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_ascii_wchar, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ascii = { mbfl_no_encoding_wchar, mbfl_no_encoding_ascii, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_ascii, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c index 45a2049c03..9e5548b494 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -46,7 +46,7 @@ const struct mbfl_convert_vtbl vtbl_8bit_b64 = { mbfl_no_encoding_8bit, mbfl_no_encoding_base64, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_base64enc, mbfl_filt_conv_base64enc_flush, NULL, @@ -56,7 +56,7 @@ const struct mbfl_convert_vtbl vtbl_b64_8bit = { mbfl_no_encoding_base64, mbfl_no_encoding_8bit, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_base64dec, mbfl_filt_conv_base64dec_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c index 692f449d54..6d0d22aa19 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -95,7 +95,7 @@ const struct mbfl_convert_vtbl vtbl_big5_wchar = { mbfl_no_encoding_big5, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_big5_wchar, mbfl_filt_conv_common_flush, NULL, @@ -105,7 +105,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_big5 = { mbfl_no_encoding_wchar, mbfl_no_encoding_big5, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_big5, mbfl_filt_conv_common_flush, NULL @@ -115,7 +115,7 @@ const struct mbfl_convert_vtbl vtbl_cp950_wchar = { mbfl_no_encoding_cp950, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_big5_wchar, mbfl_filt_conv_common_flush, NULL, @@ -125,7 +125,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp950 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp950, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_big5, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c index 8a9f80fe56..72b5b2b7b2 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_byte2be_wchar = { mbfl_no_encoding_byte2be, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_byte2be_wchar, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte2be = { mbfl_no_encoding_wchar, mbfl_no_encoding_byte2be, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_byte2be, mbfl_filt_conv_common_flush, NULL, @@ -77,7 +77,7 @@ const struct mbfl_convert_vtbl vtbl_byte2le_wchar = { mbfl_no_encoding_byte2le, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_byte2le_wchar, mbfl_filt_conv_common_flush, NULL, @@ -87,7 +87,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte2le = { mbfl_no_encoding_wchar, mbfl_no_encoding_byte2le, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_byte2le, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c index 22ff22fd41..b566e54772 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_byte4be_wchar = { mbfl_no_encoding_byte4be, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_byte4be_wchar, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4be = { mbfl_no_encoding_wchar, mbfl_no_encoding_byte4be, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_byte4be, mbfl_filt_conv_common_flush, NULL, @@ -77,7 +77,7 @@ const struct mbfl_convert_vtbl vtbl_byte4le_wchar = { mbfl_no_encoding_byte4le, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_byte4le_wchar, mbfl_filt_conv_common_flush, NULL, @@ -87,7 +87,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4le = { mbfl_no_encoding_wchar, mbfl_no_encoding_byte4le, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_byte4le, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index 5295700e28..021c2f617e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1251 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp1251, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp1251, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_cp1251_wchar = { mbfl_no_encoding_cp1251, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp1251_wchar, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c index 7e9a69881d..8208efffaa 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_cp1252_wchar = { mbfl_no_encoding_cp1252, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp1252_wchar, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1252 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp1252, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp1252, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c index 2c9050f275..70846984f7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_cp1254_wchar = { mbfl_no_encoding_cp1254, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp1254_wchar, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1254 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp1254, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp1254, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c index a201154169..61a862f94b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -138,7 +138,7 @@ const struct mbfl_convert_vtbl vtbl_jis_ms_wchar = { mbfl_no_encoding_jis_ms, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis_ms_wchar, mbfl_filt_conv_common_flush, NULL, @@ -148,7 +148,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_jis_ms = { mbfl_no_encoding_wchar, mbfl_no_encoding_jis_ms, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_jis_ms, mbfl_filt_conv_any_jis_flush, NULL, @@ -158,7 +158,7 @@ const struct mbfl_convert_vtbl vtbl_cp50220_wchar = { mbfl_no_encoding_cp50220, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis_ms_wchar, mbfl_filt_conv_common_flush, NULL, @@ -178,7 +178,7 @@ const struct mbfl_convert_vtbl vtbl_cp50220raw_wchar = { mbfl_no_encoding_cp50220raw, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis_ms_wchar, mbfl_filt_conv_common_flush, NULL, @@ -198,7 +198,7 @@ const struct mbfl_convert_vtbl vtbl_cp50221_wchar = { mbfl_no_encoding_cp50221, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis_ms_wchar, mbfl_filt_conv_common_flush, NULL, @@ -208,7 +208,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp50221 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp50221, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp50221, mbfl_filt_conv_any_jis_flush, NULL, @@ -218,7 +218,7 @@ const struct mbfl_convert_vtbl vtbl_cp50222_wchar = { mbfl_no_encoding_cp50222, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis_ms_wchar, mbfl_filt_conv_common_flush, NULL, @@ -228,7 +228,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp50222 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp50222, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp50222, mbfl_filt_conv_wchar_cp50222_flush, NULL, @@ -612,13 +612,9 @@ mbfl_filt_conv_wchar_cp50220_copy(mbfl_convert_filter *src, mbfl_convert_filter static void mbfl_filt_conv_wchar_cp50220_dtor(mbfl_convert_filter *filt) { - vtbl_tl_jisx0201_jisx0208.filter_dtor(filt); - if (filt->opaque != NULL) { efree(filt->opaque); } - - mbfl_filt_conv_common_dtor(filt); } /* diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index f6f28faf12..e3d96da8b8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -80,7 +80,7 @@ const struct mbfl_convert_vtbl vtbl_cp51932_wchar = { mbfl_no_encoding_cp51932, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp51932_wchar, mbfl_filt_conv_common_flush, NULL, @@ -90,7 +90,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp51932 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp51932, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp51932, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c index 93d4427b94..e8833ad87b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -53,7 +53,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp850 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp850, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp850, mbfl_filt_conv_common_flush, NULL, @@ -63,7 +63,7 @@ const struct mbfl_convert_vtbl vtbl_cp850_wchar = { mbfl_no_encoding_cp850, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp850_wchar, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c index 1632f893de..14c49ff790 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp866 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp866, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp866, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_cp866_wchar = { mbfl_no_encoding_cp866, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp866_wchar, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c index 19f6481d5c..b2ec5a9968 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -78,7 +78,7 @@ const struct mbfl_convert_vtbl vtbl_cp932_wchar = { mbfl_no_encoding_cp932, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp932_wchar, mbfl_filt_conv_common_flush, NULL, @@ -88,7 +88,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp932 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp932, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp932, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c index 8b36058b2c..5baa0dabbc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c @@ -77,7 +77,7 @@ const struct mbfl_convert_vtbl vtbl_cp936_wchar = { mbfl_no_encoding_cp936, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_cp936_wchar, mbfl_filt_conv_common_flush, NULL, @@ -87,7 +87,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp936 = { mbfl_no_encoding_wchar, mbfl_no_encoding_cp936, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_cp936, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c index bff3bf9d0e..7a8431219e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -77,7 +77,7 @@ const struct mbfl_convert_vtbl vtbl_euccn_wchar = { mbfl_no_encoding_euc_cn, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_euccn_wchar, mbfl_filt_conv_common_flush, NULL, @@ -87,7 +87,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_euccn = { mbfl_no_encoding_wchar, mbfl_no_encoding_euc_cn, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_euccn, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c index 0802ab7b7d..ac12b3ed94 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -78,7 +78,7 @@ const struct mbfl_convert_vtbl vtbl_eucjp_wchar = { mbfl_no_encoding_euc_jp, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_eucjp_wchar, mbfl_filt_conv_common_flush, NULL, @@ -88,7 +88,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjp = { mbfl_no_encoding_wchar, mbfl_no_encoding_euc_jp, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_eucjp, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c index 4cced6adcf..8efb49eff7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -58,7 +58,7 @@ const struct mbfl_convert_vtbl vtbl_eucjp2004_wchar = { mbfl_no_encoding_eucjp2004, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis2004_wchar, mbfl_filt_conv_common_flush, NULL, @@ -68,7 +68,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjp2004 = { mbfl_no_encoding_wchar, mbfl_no_encoding_eucjp2004, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_jis2004, mbfl_filt_conv_jis2004_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c index c224bfe59d..7845fa2d1a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -81,7 +81,7 @@ const struct mbfl_convert_vtbl vtbl_eucjpwin_wchar = { mbfl_no_encoding_eucjp_win, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_eucjpwin_wchar, mbfl_filt_conv_common_flush, NULL, @@ -91,7 +91,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjpwin = { mbfl_no_encoding_wchar, mbfl_no_encoding_eucjp_win, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_eucjpwin, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c index d8c46345ed..fef81b693b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c @@ -76,7 +76,7 @@ const struct mbfl_convert_vtbl vtbl_euckr_wchar = { mbfl_no_encoding_euc_kr, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_euckr_wchar, mbfl_filt_conv_common_flush, NULL, @@ -86,7 +86,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_euckr = { mbfl_no_encoding_wchar, mbfl_no_encoding_euc_kr, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_euckr, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c index e1df5cf043..fe908c4ffb 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c @@ -78,7 +78,7 @@ const struct mbfl_convert_vtbl vtbl_euctw_wchar = { mbfl_no_encoding_euc_tw, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_euctw_wchar, mbfl_filt_conv_common_flush, NULL, @@ -88,7 +88,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_euctw = { mbfl_no_encoding_wchar, mbfl_no_encoding_euc_tw, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_euctw, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index 7e3900a1cf..1bda813bb9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -59,7 +59,7 @@ const struct mbfl_convert_vtbl vtbl_gb18030_wchar = { mbfl_no_encoding_gb18030, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_gb18030_wchar, mbfl_filt_conv_common_flush, NULL, @@ -69,7 +69,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_gb18030 = { mbfl_no_encoding_wchar, mbfl_no_encoding_gb18030, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_gb18030, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c index f61ac6f5a8..7176fd4717 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c @@ -68,7 +68,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_html = { mbfl_no_encoding_wchar, mbfl_no_encoding_html_ent, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_html_enc, mbfl_filt_conv_html_enc_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h index 979f6011ea..b61207da26 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h @@ -43,7 +43,5 @@ int mbfl_filt_conv_html_enc_flush(mbfl_convert_filter *filter); int mbfl_filt_conv_html_dec(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_html_dec_flush(mbfl_convert_filter *filter); void mbfl_filt_conv_html_dec_copy(mbfl_convert_filter *src, mbfl_convert_filter *dest); -void mbfl_filt_conv_html_dec_ctor(mbfl_convert_filter *filter); -void mbfl_filt_conv_html_dec_dtor(mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_HTMLENT_H */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.c b/ext/mbstring/libmbfl/filters/mbfilter_hz.c index 93de2bffeb..1d95613b74 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_hz.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.c @@ -56,7 +56,7 @@ const struct mbfl_convert_vtbl vtbl_hz_wchar = { mbfl_no_encoding_hz, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_hz_wchar, mbfl_filt_conv_common_flush, NULL, @@ -66,7 +66,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_hz = { mbfl_no_encoding_wchar, mbfl_no_encoding_hz, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_hz, mbfl_filt_conv_any_hz_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c index 69c95d57f3..9183e1e2a3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c @@ -60,7 +60,7 @@ const struct mbfl_convert_vtbl vtbl_2022jpms_wchar = { mbfl_no_encoding_2022jpms, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_2022jpms_wchar, mbfl_filt_conv_common_flush, NULL, @@ -70,7 +70,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jpms = { mbfl_no_encoding_wchar, mbfl_no_encoding_2022jpms, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_2022jpms, mbfl_filt_conv_any_2022jpms_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c index 1ed8940e75..8d8f917186 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022kr = { mbfl_no_encoding_wchar, mbfl_no_encoding_2022kr, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_2022kr, mbfl_filt_conv_any_2022kr_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_2022kr_wchar = { mbfl_no_encoding_2022kr, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_2022kr_wchar, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c index 85520c2af8..7b9a663e12 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -58,7 +58,7 @@ const struct mbfl_convert_vtbl vtbl_2022jp_2004_wchar = { mbfl_no_encoding_2022jp_2004, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis2004_wchar, mbfl_filt_conv_common_flush, NULL, @@ -68,7 +68,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jp_2004 = { mbfl_no_encoding_wchar, mbfl_no_encoding_2022jp_2004, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_jis2004, mbfl_filt_conv_jis2004_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c index 2fe7379d01..0d4795942a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c @@ -62,7 +62,7 @@ const struct mbfl_convert_vtbl vtbl_2022jp_kddi_wchar = { mbfl_no_encoding_2022jp_kddi, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_2022jp_mobile_wchar, mbfl_filt_conv_common_flush, NULL, @@ -72,7 +72,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jp_kddi = { mbfl_no_encoding_wchar, mbfl_no_encoding_2022jp_kddi, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_2022jp_mobile, mbfl_filt_conv_any_jis_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c index ad876d53df..ce94528f4a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -54,7 +54,7 @@ const struct mbfl_convert_vtbl vtbl_8859_1_wchar = { mbfl_no_encoding_8859_1, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_1_wchar, mbfl_filt_conv_common_flush, NULL, @@ -64,7 +64,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_1 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_1, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_1, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c index 49599d43f5..cee8d60a8f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_10_wchar = { mbfl_no_encoding_8859_10, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_10_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_10 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_10, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_10, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c index 7a3193b66c..daaf7bec50 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_13_wchar = { mbfl_no_encoding_8859_13, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_13_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_13 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_13, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_13, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c index 62ea49ca2f..edc5c72c85 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_14_wchar = { mbfl_no_encoding_8859_14, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_14_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_14 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_14, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_14, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c index 702c260c3d..38b77fc077 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_15_wchar = { mbfl_no_encoding_8859_15, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_15_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_15 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_15, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_15, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c index f63df4a324..355c300466 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_16_wchar = { mbfl_no_encoding_8859_16, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_16_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_16 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_16, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_16, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c index 4488ec49b9..279ee694fc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_2_wchar = { mbfl_no_encoding_8859_2, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_2_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_2 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_2, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_2, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c index 0f19aff8fc..853a7e202f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_3_wchar = { mbfl_no_encoding_8859_3, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_3_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_3 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_3, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_3, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c index 42b19152ad..264c0eae98 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -54,7 +54,7 @@ const struct mbfl_convert_vtbl vtbl_8859_4_wchar = { mbfl_no_encoding_8859_4, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_4_wchar, mbfl_filt_conv_common_flush, NULL, @@ -64,7 +64,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_4 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_4, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_4, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c index d7674ab281..f17da31260 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_5_wchar = { mbfl_no_encoding_8859_5, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_5_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_5 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_5, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_5, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c index 9c44928685..d184a71495 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_6_wchar = { mbfl_no_encoding_8859_6, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_6_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_6 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_6, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_6, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c index 6d475c9ccf..029fed0729 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_7_wchar = { mbfl_no_encoding_8859_7, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_7_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_7 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_7, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_7, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c index 0fe7fbe761..16bc6e4f6e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_8_wchar = { mbfl_no_encoding_8859_8, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_8_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_8 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_8, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_8, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c index 7493e1519c..2d45c1b91c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_8859_9_wchar = { mbfl_no_encoding_8859_9, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8859_9_wchar, mbfl_filt_conv_common_flush, NULL, @@ -65,7 +65,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_9 = { mbfl_no_encoding_wchar, mbfl_no_encoding_8859_9, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8859_9, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c index 84656e64da..91ed552bcd 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -76,7 +76,7 @@ const struct mbfl_convert_vtbl vtbl_jis_wchar = { mbfl_no_encoding_jis, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis_wchar, mbfl_filt_conv_common_flush, NULL, @@ -86,7 +86,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_jis = { mbfl_no_encoding_wchar, mbfl_no_encoding_jis, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_jis, mbfl_filt_conv_any_jis_flush, NULL, @@ -96,7 +96,7 @@ const struct mbfl_convert_vtbl vtbl_2022jp_wchar = { mbfl_no_encoding_2022jp, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis_wchar, mbfl_filt_conv_common_flush, NULL, @@ -106,7 +106,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jp = { mbfl_no_encoding_wchar, mbfl_no_encoding_2022jp, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_2022jp, mbfl_filt_conv_any_jis_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c index a0eb7dd08f..850437710c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c @@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_koi8r = { mbfl_no_encoding_wchar, mbfl_no_encoding_koi8r, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_koi8r, mbfl_filt_conv_common_flush, NULL, @@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_koi8r_wchar = { mbfl_no_encoding_koi8r, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_koi8r_wchar, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c index 0d75a43f82..fe495336cb 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c @@ -54,7 +54,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_koi8u = { mbfl_no_encoding_wchar, mbfl_no_encoding_koi8u, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_koi8u, mbfl_filt_conv_common_flush, NULL, @@ -64,7 +64,7 @@ const struct mbfl_convert_vtbl vtbl_koi8u_wchar = { mbfl_no_encoding_koi8u, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_koi8u_wchar, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index b03e4921d9..d42cdca883 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -48,7 +48,7 @@ const struct mbfl_convert_vtbl vtbl_8bit_qprint = { mbfl_no_encoding_8bit, mbfl_no_encoding_qprint, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_qprintenc, mbfl_filt_conv_qprintenc_flush, NULL, @@ -58,7 +58,7 @@ const struct mbfl_convert_vtbl vtbl_qprint_8bit = { mbfl_no_encoding_qprint, mbfl_no_encoding_8bit, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_qprintdec, mbfl_filt_conv_qprintdec_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c index 0fd98a167d..c6e83913da 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -81,7 +81,7 @@ const struct mbfl_convert_vtbl vtbl_sjis_wchar = { mbfl_no_encoding_sjis, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_sjis_wchar, mbfl_filt_conv_common_flush, NULL, @@ -91,7 +91,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis = { mbfl_no_encoding_wchar, mbfl_no_encoding_sjis, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_sjis, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c index 43656e1446..93324a4ae7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c @@ -63,7 +63,7 @@ const struct mbfl_convert_vtbl vtbl_sjis2004_wchar = { mbfl_no_encoding_sjis2004, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_jis2004_wchar, mbfl_filt_conv_common_flush, NULL, @@ -73,7 +73,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis2004 = { mbfl_no_encoding_wchar, mbfl_no_encoding_sjis2004, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_jis2004, mbfl_filt_conv_jis2004_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c index af21db07ba..196ec0a59d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -64,7 +64,7 @@ const struct mbfl_convert_vtbl vtbl_sjis_mac_wchar = { mbfl_no_encoding_sjis_mac, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_sjis_mac_wchar, mbfl_filt_conv_common_flush, NULL, @@ -74,7 +74,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_mac = { mbfl_no_encoding_wchar, mbfl_no_encoding_sjis_mac, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_sjis_mac, mbfl_filt_conv_sjis_mac_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index 28de982e86..ca84faae47 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -101,7 +101,7 @@ const struct mbfl_convert_vtbl vtbl_sjis_docomo_wchar = { mbfl_no_encoding_sjis_docomo, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_sjis_mobile_wchar, mbfl_filt_conv_common_flush, NULL, @@ -111,7 +111,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_docomo = { mbfl_no_encoding_wchar, mbfl_no_encoding_sjis_docomo, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_sjis_mobile, mbfl_filt_conv_sjis_mobile_flush, NULL, @@ -121,7 +121,7 @@ const struct mbfl_convert_vtbl vtbl_sjis_kddi_wchar = { mbfl_no_encoding_sjis_kddi, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_sjis_mobile_wchar, mbfl_filt_conv_common_flush, NULL, @@ -131,7 +131,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_kddi = { mbfl_no_encoding_wchar, mbfl_no_encoding_sjis_kddi, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_sjis_mobile, mbfl_filt_conv_sjis_mobile_flush, NULL, @@ -141,7 +141,7 @@ const struct mbfl_convert_vtbl vtbl_sjis_sb_wchar = { mbfl_no_encoding_sjis_sb, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_sjis_mobile_wchar, mbfl_filt_conv_common_flush, NULL, @@ -151,7 +151,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_sb = { mbfl_no_encoding_wchar, mbfl_no_encoding_sjis_sb, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_sjis_mobile, mbfl_filt_conv_sjis_mobile_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c index 70f33370e3..f8adc5474e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -78,7 +78,7 @@ const struct mbfl_convert_vtbl vtbl_sjis_open_wchar = { mbfl_no_encoding_sjis_open, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_sjis_open_wchar, mbfl_filt_conv_common_flush, NULL, @@ -88,7 +88,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_open = { mbfl_no_encoding_wchar, mbfl_no_encoding_sjis_open, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_sjis_open, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c index 7424480a22..6831c2d2e7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c @@ -31,11 +31,6 @@ mbfl_filt_tl_jisx0201_jisx0208_init(mbfl_convert_filter *filt) mbfl_filt_conv_common_ctor(filt); } -void -mbfl_filt_tl_jisx0201_jisx0208_cleanup(mbfl_convert_filter *filt) -{ -} - int mbfl_filt_tl_jisx0201_jisx0208(int c, mbfl_convert_filter *filt) { @@ -294,7 +289,7 @@ const struct mbfl_convert_vtbl vtbl_tl_jisx0201_jisx0208 = { mbfl_no_encoding_wchar, mbfl_no_encoding_wchar, mbfl_filt_tl_jisx0201_jisx0208_init, - mbfl_filt_tl_jisx0201_jisx0208_cleanup, + NULL, mbfl_filt_tl_jisx0201_jisx0208, mbfl_filt_tl_jisx0201_jisx0208_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c index 02046b30e8..68172efbe6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -69,7 +69,7 @@ const struct mbfl_convert_vtbl vtbl_ucs2_wchar = { mbfl_no_encoding_ucs2, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_ucs2_wchar, mbfl_filt_conv_common_flush, NULL, @@ -79,7 +79,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs2 = { mbfl_no_encoding_wchar, mbfl_no_encoding_ucs2, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_ucs2be, mbfl_filt_conv_common_flush, NULL, @@ -89,7 +89,7 @@ const struct mbfl_convert_vtbl vtbl_ucs2be_wchar = { mbfl_no_encoding_ucs2be, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_ucs2be_wchar, mbfl_filt_conv_common_flush, NULL, @@ -99,7 +99,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs2be = { mbfl_no_encoding_wchar, mbfl_no_encoding_ucs2be, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_ucs2be, mbfl_filt_conv_common_flush, NULL, @@ -109,7 +109,7 @@ const struct mbfl_convert_vtbl vtbl_ucs2le_wchar = { mbfl_no_encoding_ucs2le, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_ucs2le_wchar, mbfl_filt_conv_common_flush, NULL, @@ -119,7 +119,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs2le = { mbfl_no_encoding_wchar, mbfl_no_encoding_ucs2le, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_ucs2le, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c index 9ce1fc931b..fcdd20d615 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -69,7 +69,7 @@ const struct mbfl_convert_vtbl vtbl_ucs4_wchar = { mbfl_no_encoding_ucs4, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_ucs4_wchar, mbfl_filt_conv_common_flush, NULL, @@ -79,7 +79,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs4 = { mbfl_no_encoding_wchar, mbfl_no_encoding_ucs4, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_ucs4be, mbfl_filt_conv_common_flush, NULL, @@ -89,7 +89,7 @@ const struct mbfl_convert_vtbl vtbl_ucs4be_wchar = { mbfl_no_encoding_ucs4be, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_ucs4be_wchar, mbfl_filt_conv_common_flush, NULL, @@ -99,7 +99,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs4be = { mbfl_no_encoding_wchar, mbfl_no_encoding_ucs4be, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_ucs4be, mbfl_filt_conv_common_flush, NULL, @@ -109,7 +109,7 @@ const struct mbfl_convert_vtbl vtbl_ucs4le_wchar = { mbfl_no_encoding_ucs4le, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_ucs4le_wchar, mbfl_filt_conv_common_flush, NULL, @@ -119,7 +119,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs4le = { mbfl_no_encoding_wchar, mbfl_no_encoding_ucs4le, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_ucs4le, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c index aa55395e90..403fc01081 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -77,7 +77,7 @@ const struct mbfl_convert_vtbl vtbl_uhc_wchar = { mbfl_no_encoding_uhc, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_uhc_wchar, mbfl_filt_conv_common_flush, NULL, @@ -87,7 +87,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_uhc = { mbfl_no_encoding_wchar, mbfl_no_encoding_uhc, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_uhc, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c index 27e307c8e8..620e8a76f7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -69,7 +69,7 @@ const struct mbfl_convert_vtbl vtbl_utf16_wchar = { mbfl_no_encoding_utf16, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf16_wchar, mbfl_filt_conv_common_flush, NULL, @@ -79,7 +79,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf16 = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf16, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf16be, mbfl_filt_conv_common_flush, NULL, @@ -89,7 +89,7 @@ const struct mbfl_convert_vtbl vtbl_utf16be_wchar = { mbfl_no_encoding_utf16be, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf16be_wchar, mbfl_filt_conv_common_flush, NULL, @@ -99,7 +99,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf16be = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf16be, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf16be, mbfl_filt_conv_common_flush, NULL, @@ -109,7 +109,7 @@ const struct mbfl_convert_vtbl vtbl_utf16le_wchar = { mbfl_no_encoding_utf16le, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf16le_wchar, mbfl_filt_conv_common_flush, NULL, @@ -119,7 +119,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf16le = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf16le, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf16le, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c index ac3c32b12c..b936ab4102 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c @@ -69,7 +69,7 @@ const struct mbfl_convert_vtbl vtbl_utf32_wchar = { mbfl_no_encoding_utf32, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf32_wchar, mbfl_filt_conv_common_flush, NULL, @@ -79,7 +79,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf32 = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf32, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf32be, mbfl_filt_conv_common_flush, NULL, @@ -89,7 +89,7 @@ const struct mbfl_convert_vtbl vtbl_utf32be_wchar = { mbfl_no_encoding_utf32be, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf32be_wchar, mbfl_filt_conv_common_flush, NULL, @@ -99,7 +99,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf32be = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf32be, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf32be, mbfl_filt_conv_common_flush, NULL, @@ -109,7 +109,7 @@ const struct mbfl_convert_vtbl vtbl_utf32le_wchar = { mbfl_no_encoding_utf32le, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf32le_wchar, mbfl_filt_conv_common_flush, NULL, @@ -119,7 +119,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf32le = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf32le, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf32le, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c index 2318a19584..744c522807 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -69,7 +69,7 @@ const struct mbfl_convert_vtbl vtbl_utf7_wchar = { mbfl_no_encoding_utf7, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf7_wchar, mbfl_filt_conv_common_flush, NULL, @@ -79,7 +79,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf7 = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf7, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf7, mbfl_filt_conv_wchar_utf7_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c index 7b346236bb..c8fe70fc7f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c @@ -45,7 +45,7 @@ const struct mbfl_convert_vtbl vtbl_utf7imap_wchar = { mbfl_no_encoding_utf7imap, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf7imap_wchar, mbfl_filt_conv_common_flush, NULL, @@ -55,7 +55,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf7imap = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf7imap, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf7imap, mbfl_filt_conv_wchar_utf7imap_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c index dac6e0afa9..26fd41def1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c @@ -75,7 +75,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_wchar = { mbfl_no_encoding_utf8, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf8_wchar, mbfl_filt_conv_utf8_wchar_flush, NULL, @@ -85,7 +85,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8 = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf8, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf8, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index 041d5fa799..5d23b75d4c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -118,7 +118,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_docomo_wchar = { mbfl_no_encoding_utf8_docomo, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf8_mobile_wchar, mbfl_filt_conv_utf8_wchar_flush, NULL, @@ -128,7 +128,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_docomo = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf8_docomo, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf8_mobile, mbfl_filt_conv_common_flush, NULL, @@ -138,7 +138,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_kddi_a_wchar = { mbfl_no_encoding_utf8_kddi_a, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf8_mobile_wchar, mbfl_filt_conv_utf8_wchar_flush, NULL, @@ -148,7 +148,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_a = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf8_kddi_a, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf8_mobile, mbfl_filt_conv_common_flush, NULL, @@ -158,7 +158,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_kddi_b_wchar = { mbfl_no_encoding_utf8_kddi_b, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf8_mobile_wchar, mbfl_filt_conv_utf8_wchar_flush, NULL, @@ -168,7 +168,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_b = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf8_kddi_b, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf8_mobile, mbfl_filt_conv_common_flush, NULL, @@ -178,7 +178,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_sb_wchar = { mbfl_no_encoding_utf8_sb, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_utf8_mobile_wchar, mbfl_filt_conv_utf8_wchar_flush, NULL, @@ -188,7 +188,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_sb = { mbfl_no_encoding_wchar, mbfl_no_encoding_utf8_sb, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_utf8_mobile, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index a78acd3718..fab29ef9fc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -45,7 +45,7 @@ const struct mbfl_convert_vtbl vtbl_uuencode_8bit = { mbfl_no_encoding_uuencode, mbfl_no_encoding_8bit, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_uudec, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 65817d384a..b5b760a2bc 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -1232,8 +1232,10 @@ mbfl_strcut( if (device.pos > length) { p = _bk.p; device.pos = _bk.pos; - decoder->filter_dtor(decoder); - encoder->filter_dtor(encoder); + if (decoder->filter_dtor) + decoder->filter_dtor(decoder); + if (encoder->filter_dtor) + encoder->filter_dtor(encoder); mbfl_convert_filter_copy(&_bk.decoder, decoder); mbfl_convert_filter_copy(&_bk.encoder, encoder); bk = _bk; @@ -1250,24 +1252,32 @@ mbfl_strcut( /* if the offset of the resulting string exceeds the length, * then restore the state */ if (device.pos > length) { - bk.decoder.filter_dtor(&bk.decoder); - bk.encoder.filter_dtor(&bk.encoder); + if (bk.decoder.filter_dtor) + bk.decoder.filter_dtor(&bk.decoder); + if (bk.encoder.filter_dtor) + bk.encoder.filter_dtor(&bk.encoder); p = _bk.p; device.pos = _bk.pos; - decoder->filter_dtor(decoder); - encoder->filter_dtor(encoder); + if (decoder->filter_dtor) + decoder->filter_dtor(decoder); + if (encoder->filter_dtor) + encoder->filter_dtor(encoder); mbfl_convert_filter_copy(&_bk.decoder, decoder); mbfl_convert_filter_copy(&_bk.encoder, encoder); bk = _bk; } else { - _bk.decoder.filter_dtor(&_bk.decoder); - _bk.encoder.filter_dtor(&_bk.encoder); + if (_bk.decoder.filter_dtor) + _bk.decoder.filter_dtor(&_bk.decoder); + if (_bk.encoder.filter_dtor) + _bk.encoder.filter_dtor(&_bk.encoder); p = bk.p; device.pos = bk.pos; - decoder->filter_dtor(decoder); - encoder->filter_dtor(encoder); + if (decoder->filter_dtor) + decoder->filter_dtor(decoder); + if (encoder->filter_dtor) + encoder->filter_dtor(encoder); mbfl_convert_filter_copy(&bk.decoder, decoder); mbfl_convert_filter_copy(&bk.encoder, encoder); } @@ -1284,8 +1294,10 @@ mbfl_strcut( /* restore filter */ p = bk.p; device.pos = bk.pos; - decoder->filter_dtor(decoder); - encoder->filter_dtor(encoder); + if (decoder->filter_dtor) + decoder->filter_dtor(decoder); + if (encoder->filter_dtor) + encoder->filter_dtor(encoder); mbfl_convert_filter_copy(&bk.decoder, decoder); mbfl_convert_filter_copy(&bk.encoder, encoder); break; @@ -1302,26 +1314,34 @@ mbfl_strcut( (*encoder->filter_flush)(encoder); if (device.pos > length) { - _bk.decoder.filter_dtor(&_bk.decoder); - _bk.encoder.filter_dtor(&_bk.encoder); + if (_bk.decoder.filter_dtor) + _bk.decoder.filter_dtor(&_bk.decoder); + if (_bk.encoder.filter_dtor) + _bk.encoder.filter_dtor(&_bk.encoder); /* restore filter */ p = bk.p; device.pos = bk.pos; - decoder->filter_dtor(decoder); - encoder->filter_dtor(encoder); + if (decoder->filter_dtor) + decoder->filter_dtor(decoder); + if (encoder->filter_dtor) + encoder->filter_dtor(encoder); mbfl_convert_filter_copy(&bk.decoder, decoder); mbfl_convert_filter_copy(&bk.encoder, encoder); break; } - bk.decoder.filter_dtor(&bk.decoder); - bk.encoder.filter_dtor(&bk.encoder); + if (bk.decoder.filter_dtor) + bk.decoder.filter_dtor(&bk.decoder); + if (bk.encoder.filter_dtor) + bk.encoder.filter_dtor(&bk.encoder); p = _bk.p; device.pos = _bk.pos; - decoder->filter_dtor(decoder); - encoder->filter_dtor(encoder); + if (decoder->filter_dtor) + decoder->filter_dtor(decoder); + if (encoder->filter_dtor) + encoder->filter_dtor(encoder); mbfl_convert_filter_copy(&_bk.decoder, decoder); mbfl_convert_filter_copy(&_bk.encoder, encoder); @@ -1330,8 +1350,10 @@ mbfl_strcut( (*encoder->filter_flush)(encoder); - bk.decoder.filter_dtor(&bk.decoder); - bk.encoder.filter_dtor(&bk.encoder); + if (bk.decoder.filter_dtor) + bk.decoder.filter_dtor(&bk.decoder); + if (bk.encoder.filter_dtor) + bk.encoder.filter_dtor(&bk.encoder); result = mbfl_memory_device_result(&device, result); diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index 059feb0b3c..f4c74946c1 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -54,7 +54,7 @@ const struct mbfl_convert_vtbl vtbl_8bit_wchar = { mbfl_no_encoding_8bit, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_8bit_wchar, mbfl_filt_conv_common_flush, NULL, @@ -64,7 +64,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_8bit = { mbfl_no_encoding_wchar, mbfl_no_encoding_8bit, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_wchar_8bit, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index 5136bb1c72..3d7cffe9c1 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -49,7 +49,7 @@ const struct mbfl_convert_vtbl vtbl_pass = { mbfl_no_encoding_pass, mbfl_no_encoding_pass, mbfl_filt_conv_common_ctor, - mbfl_filt_conv_common_dtor, + NULL, mbfl_filt_conv_pass, mbfl_filt_conv_common_flush, NULL, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 0f41e35b25..544fee7a33 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -169,7 +169,9 @@ mbfl_convert_filter* mbfl_convert_filter_new2(const struct mbfl_convert_vtbl *vt void mbfl_convert_filter_delete(mbfl_convert_filter *filter) { - (*filter->filter_dtor)(filter); + if (filter->filter_dtor) { + (*filter->filter_dtor)(filter); + } efree(filter); } @@ -387,7 +389,7 @@ const struct mbfl_convert_vtbl* mbfl_convert_filter_get_vtbl(const mbfl_encoding } /* - * commonly used constructor and destructor + * commonly used constructor */ void mbfl_filt_conv_common_ctor(mbfl_convert_filter *filter) { @@ -405,9 +407,3 @@ int mbfl_filt_conv_common_flush(mbfl_convert_filter *filter) } return 0; } - -void mbfl_filt_conv_common_dtor(mbfl_convert_filter *filter) -{ - filter->status = 0; - filter->cache = 0; -} diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h index f38de7eefe..6fc6b3c6bc 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h @@ -73,7 +73,6 @@ MBFLAPI extern const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(con MBFLAPI extern void mbfl_filt_conv_common_ctor(mbfl_convert_filter *filter); MBFLAPI extern int mbfl_filt_conv_common_flush(mbfl_convert_filter *filter); -MBFLAPI extern void mbfl_filt_conv_common_dtor(mbfl_convert_filter *filter); MBFLAPI extern void mbfl_convert_filter_devcat(mbfl_convert_filter *filter, mbfl_memory_device *src); MBFLAPI extern int mbfl_convert_filter_strcat(mbfl_convert_filter *filter, const unsigned char *p); |