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.

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c
index 451860f435bfebd8f6da96b471967b6c61bb2c64..42ed23326daf6e9a64137f96470b61380abe2372 100644 (file)
--- 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 697e37dee9976d03d63f2d6c031e5fa13ff955f0..e168176cc03d25eb6d484ccf15a2da92321b6b88 100644 (file)
--- 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 489f1deea340ac9ddb5ff2c0690b3591b9b28b6c..a1e9533bc86b2e4cd36b28974a8ca07aa68b4356 100644 (file)
--- 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 45a2049c03788ee8608b668aed49b30f40c4ef3b..9e5548b49419a15cd8aa7ebb411156c80473c679 100644 (file)
--- 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 692f449d542934042951532f4d7715f4e3baa4cb..6d0d22aa192d20fc7e9bc8e0182e175b8d576f4a 100644 (file)
--- 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 8a9f80fe56981529b9e1fdbd6c51f81ba8776373..72b5b2b7b2f8aad4f4be27f6ca6be2e7cb857c94 100644 (file)
--- 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 22ff22fd41b0e49bc4fd8ef49f5c43445bc25c28..b566e547725d74c302f7e48e7f0dcbd35da543c0 100644 (file)
--- 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 5295700e2888aacd1ee2233aa23f2ea1fff906e2..021c2f617ef9205ad4cdcbbeadc01f30a41c7893 100644 (file)
--- 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 7e9a69881d7671b58c3546d14eac1c27f4a3c6b5..8208efffaa93c3005ff30d3665d596db2cc09f9b 100644 (file)
--- 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 2c9050f2759753b173bc38f070bfe4f4cbbca104..70846984f778c2d8f7df895b384cd0fd614b3e07 100644 (file)
--- 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 a20115416999d0c97ed9672578166ada8e55d93b..61a862f94b62f83e989986df27829ef938084629 100644 (file)
--- 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 f6f28faf12ac52ef39836732ac2dfb3b6d658c9f..e3d96da8b88ab98c4884a805a4216196e42ddc44 100644 (file)
--- 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 93d4427b94daead6bf9c0d70e7e8244036203e87..e8833ad87b49e60f150b5bb777b61a9437fd8398 100644 (file)
--- 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 1632f893dea9f876e457228824d2675ab7604755..14c49ff790386f7fc3133302caa19c8b064f5b15 100644 (file)
--- 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 19f6481d5cda1338e26fd5e70272bb0900a8f555..b2ec5a99685b392223c51b9698d32bbb23ef347a 100644 (file)
--- 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 8b36058b2cc4cf68741d83d5dcc1e4f7f0aafa7d..5baa0dabbcbaa914765ea9d2528273241b081a3f 100644 (file)
--- 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 bff3bf9d0eb663dce02cae53debdfd17688f6f68..7a8431219e42ca9b3575d1e8d8812e4da6346f01 100644 (file)
--- 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 0802ab7b7d50b1829eb23ad6935ceb731370c04b..ac12b3ed948b4e7400932be8bbd4e41c2a366c33 100644 (file)
--- 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 4cced6adcf24864ba339c3bb629dfd1d198f50eb..8efb49eff71f50db693b0f8cd88d08f55b471b44 100644 (file)
--- 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 c224bfe59d22ee91c03416e9458828792379358b..7845fa2d1aa4afb90fd466e60f7fb544cfe06f18 100644 (file)
--- 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 d8c46345ed4770a836daf7285d31935c38b77e59..fef81b693be197e820c25807c19aea04cb2f5d5f 100644 (file)
--- 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 e1df5cf0437c9bcae38c63543014e80a279e64ae..fe908c4ffb1bcd4abdeb6825ac99c5160030f267 100644 (file)
--- 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 7e3900a1cf5043fc5844d4a322061f2da4d2b8fe..1bda813bb9aad87ce4d150c79ea6fc99b56de9d1 100644 (file)
--- 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 f61ac6f5a88eb6bb55fedc4388c927ed7466176a..7176fd4717ade340aa0254a3fecd2d68984fc2c5 100644 (file)
--- 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 979f6011ea033ae481fe7b2b80cc38ee04e0d97b..b61207da262d408ab43b854de14d807e07b6ad6f 100644 (file)
--- 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 93de2bffebe6651debf80c9a957639e17ea5898e..1d95613b7455fd717a4ceb0f091b495495d0e8c8 100644 (file)
--- 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 69c95d57f3b7bb41e5c4b0ba72238d8a9b0099db..9183e1e2a34911a256b2606fb267cd1e98d4807a 100644 (file)
--- 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 1ed8940e753452721817b069ded833e119e4da4d..8d8f9171867dc9951c3ad92eeb84db8acfd410f7 100644 (file)
--- 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 85520c2af89c01d7a932abf6006d9b3535af3f04..7b9a663e122931248a5a7512a0363f0662bb71e4 100644 (file)
--- 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 2fe7379d01cff01d238f479e39122f64d629d89b..0d4795942adde7163e427b8b567d28e4dbe1b0b1 100644 (file)
--- 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 ad876d53dfcd6adfb45d17a749ad720c26b55139..ce94528f4a363d7f29638a08c8630c93206182b2 100644 (file)
--- 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 49599d43f5b76b89861d420e10135c5d865f1a4e..cee8d60a8fa4e70e36a4d0dbe9e6efaa4688dbcf 100644 (file)
--- 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 7a3193b66c1798beb562b3de99784c0c397dafb1..daaf7bec50f3f1ba21b4f31d111c03ba5f08363e 100644 (file)
--- 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 62ea49ca2f4ff35b919b6fd6fb706d59c2e92428..edc5c72c85e00a41d89b252c4ceff0e3893ce08a 100644 (file)
--- 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 702c260c3d0fe03a0c281ff2f70e7c02e50db1cc..38b77fc0775b448599c76f8e5c713db59f3b007a 100644 (file)
--- 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 f63df4a32494ffaf31f765abff19229cd68f1cad..355c3004669a21a3323817c75890a2a317629cde 100644 (file)
--- 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 4488ec49b9073308e1616c3de11eae7bd05aa1e2..279ee694fcc5264cab2476183dc5ea74e3d1ac6e 100644 (file)
--- 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 0f19aff8fced3d5ae3998ff69ac7731e4fe417c1..853a7e202fd563c1e4b1fd47ee87ffae422ad18b 100644 (file)
--- 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 42b19152add10b3f20495682110f6a39cd09e93a..264c0eae98fc188a2fb8056f6fa5b3028f401541 100644 (file)
--- 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 d7674ab28130d0405e815e8297bf25a72618cc0d..f17da31260b69ccdaaa6a9c5ca7e4fdc96a7e7e6 100644 (file)
--- 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 9c44928685c2eaa5f45a7d1e4874b16b71828285..d184a71495a64bc6ecdc9ef40ae30020910b893d 100644 (file)
--- 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 6d475c9ccff8bd5cb7e15916deb222bd7ccafedf..029fed07294d9e3a8fd2264dc4ac61ab20df55fb 100644 (file)
--- 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 0fe7fbe761f6d94b9349b5f281150332a998c335..16bc6e4f6ecc47ada1cf7b9005e9a20e8afc1465 100644 (file)
--- 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 7493e1519c7a20048778989a8db88801ec7f9e2f..2d45c1b91c4262ffd764b484b1bb10a4fba9bd9a 100644 (file)
--- 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 84656e64daa7a1306884fb4ca78e4df1adba5bc4..91ed552bcde89ed31082819a992afce329d7077a 100644 (file)
--- 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 a0eb7dd08fe125f9ead360e5a29d67b00487f76f..850437710ccf8d1c42911778d4999d350e3a057f 100644 (file)
--- 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 0d75a43f82c7c43fc98dd84a6515caabb43695b8..fe495336cb1eb30549c8b155acf4867255595280 100644 (file)
--- 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 b03e4921d91f7673683f829d093a0f023a71a5d9..d42cdca883ea01e355712daf6907c3b25890ce4a 100644 (file)
--- 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 0fd98a167dbf36c52c301d2a9f316811646768d2..c6e83913dacfeee4350c792b0c42f7e6b4f95842 100644 (file)
--- 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 43656e144695e481e8c7b08c5a15342a15e1ff0d..93324a4ae730e52ca9a04f59e664b183f48f6899 100644 (file)
--- 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 af21db07ba83feb88cdaf8a16b00d09a8ab99c81..196ec0a59d0a614fddfb934c016a54e227b022f2 100644 (file)
--- 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 28de982e8698f04485374ec4999c268f9f377b99..ca84faae4782a336daa234a2140f55820084aacd 100644 (file)
--- 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 70f33370e345808f6e1a6a0f41660b9ca19f3f5a..f8adc5474ea27898c54c08295f6f20b66edaf827 100644 (file)
--- 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 7424480a220c9da775e8d5f64902e6193e9efe53..6831c2d2e76609dadf8d27bf7e961dd59f9154de 100644 (file)
--- 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 02046b30e856ceba77d89592c3fe9656b1941d2f..68172efbe610c7c794462a0e893b2dfb3974df57 100644 (file)
--- 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 9ce1fc931be9b18bf3c4e636b63239902a8c24d0..fcdd20d6158d6dea15b703db9ee462ad9c257c25 100644 (file)
--- 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 aa55395e9055f8c41c6b0bbd350f4c8685c08e5e..403fc01081d136295fdb493882c7786da1421b9d 100644 (file)
--- 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 27e307c8e8dabcbf07bbb471faba4e489b670b1d..620e8a76f7c5239c692e1425e09d6c879496073b 100644 (file)
--- 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 ac3c32b12c8d659fb01731f2f013faa436f148a6..b936ab410241adcbb6cafb3da1061ee753dad15e 100644 (file)
--- 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 2318a195840ba4c54d2817906836f8d41a5cf193..744c522807f26b837c2bf9d74abf36457d8fc1a6 100644 (file)
--- 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 7b346236bb5b09253aaf26f51f20423281b43da8..c8fe70fc7f67aad6a3bc5951c5b24892f732c5b5 100644 (file)
--- 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 dac6e0afa933060cfcb13a963dac1a482ae3d36e..26fd41def1a12329462e4a427a4cb840280d56d2 100644 (file)
--- 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 041d5fa799a9133c33456ab23d5d58e36b3976df..5d23b75d4c5c8a18e5c857fd0ab532efe0067b37 100644 (file)
--- 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 a78acd3718772120964c1c9a9b17d5e8cf48ed33..fab29ef9fc8ddd23068d674f3c17b3f22fbe8f5c 100644 (file)
--- 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 65817d384a2f0b860ed054c477887af7b59b2c65..b5b760a2bc19e575ab560d0a81243e5f20405704 100644 (file)
--- 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 059feb0b3c4ec6cf83395e530a1d73b6329a5a8c..f4c74946c11b8a36fd902341286e97fcd9084eca 100644 (file)
--- 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 5136bb1c72982c606795f09fd113622640eed001..3d7cffe9c14f79fa616f7558aa753d0f5ec5508a 100644 (file)
--- 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 0f41e35b251586242531f2802a18e498d2b08638..544fee7a33ca83e7a9507c56d1183280846536c5 100644 (file)
--- 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 f38de7eefe628aec2d9c1a12a83a6e973cca75ee..6fc6b3c6bccf60edc8ec8d242aa5b15e77e9b206 100644 (file)
--- 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);