From: Alex Dowad <alexinbeijing@gmail.com>
Date: Thu, 16 Jul 2020 07:23:37 +0000 (+0200)
Subject: Remove unneeded function mbfl_filt_ident_common_dtor
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2b40ee9a5cb2161304fd205ac6b2125fe46b412;p=php

Remove unneeded function mbfl_filt_ident_common_dtor

This was the default destructor for mbfl_identify_filter structs, but there's nothing
we actually need to do to those structs before freeing them.
---

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c
index e168176cc0..38c8f98bd1 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c
@@ -48,7 +48,6 @@ const mbfl_encoding mbfl_encoding_armscii8 = {
 const struct mbfl_identify_vtbl vtbl_identify_armscii8 = {
 	mbfl_no_encoding_armscii8,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_armscii8
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c
index a1e9533bc8..43d659a46c 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c
@@ -49,7 +49,6 @@ const mbfl_encoding mbfl_encoding_ascii = {
 const struct mbfl_identify_vtbl vtbl_identify_ascii = {
 	mbfl_no_encoding_ascii,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_ascii
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c
index 6d0d22aa19..1e59924092 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c
@@ -80,14 +80,12 @@ const mbfl_encoding mbfl_encoding_cp950 = {
 const struct mbfl_identify_vtbl vtbl_identify_big5 = {
 	mbfl_no_encoding_big5,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_big5
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_cp950 = {
 	mbfl_no_encoding_cp950,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_big5
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
index 021c2f617e..470adf1a08 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
@@ -49,7 +49,6 @@ const mbfl_encoding mbfl_encoding_cp1251 = {
 const struct mbfl_identify_vtbl vtbl_identify_cp1251 = {
 	mbfl_no_encoding_cp1251,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp1251
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c
index 8208efffaa..a274e4b796 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c
@@ -49,7 +49,6 @@ const mbfl_encoding mbfl_encoding_cp1252 = {
 const struct mbfl_identify_vtbl vtbl_identify_cp1252 = {
 	mbfl_no_encoding_cp1252,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp1252
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c
index 70846984f7..7e4bb4b148 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c
@@ -49,7 +49,6 @@ const mbfl_encoding mbfl_encoding_cp1254 = {
 const struct mbfl_identify_vtbl vtbl_identify_cp1254 = {
 	mbfl_no_encoding_cp1254,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp1254
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
index 61a862f94b..a68285bc73 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
@@ -102,35 +102,30 @@ const mbfl_encoding mbfl_encoding_cp50222 = {
 const struct mbfl_identify_vtbl vtbl_identify_jis_ms = {
 	mbfl_no_encoding_jis_ms,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_jis_ms
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_cp50220 = {
 	mbfl_no_encoding_cp50220,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp50220
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_cp50220raw = {
 	mbfl_no_encoding_cp50220raw,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp50220
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_cp50221 = {
 	mbfl_no_encoding_cp50221,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp50221
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_cp50222 = {
 	mbfl_no_encoding_cp50222,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp50222
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c
index e3d96da8b8..da046c86b7 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c
@@ -61,7 +61,6 @@ static const char *mbfl_encoding_cp51932_aliases[] = {"cp51932", NULL};
 const struct mbfl_identify_vtbl vtbl_identify_cp51932 = {
 	mbfl_no_encoding_cp51932,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp51932
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c
index e8833ad87b..5d6b265fc1 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c
@@ -45,7 +45,6 @@ const mbfl_encoding mbfl_encoding_cp850 = {
 const struct mbfl_identify_vtbl vtbl_identify_cp850 = {
 	mbfl_no_encoding_cp850,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp850
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c
index 14c49ff790..504903bef0 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c
@@ -49,7 +49,6 @@ const mbfl_encoding mbfl_encoding_cp866 = {
 const struct mbfl_identify_vtbl vtbl_identify_cp866 = {
 	mbfl_no_encoding_cp866,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp866
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c
index b2ec5a9968..3cbca1cb64 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c
@@ -70,7 +70,6 @@ const mbfl_encoding mbfl_encoding_cp932 = {
 const struct mbfl_identify_vtbl vtbl_identify_cp932 = {
 	mbfl_no_encoding_cp932,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp932
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c
index 5baa0dabbc..df6d77907f 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c
@@ -69,7 +69,6 @@ const mbfl_encoding mbfl_encoding_cp936 = {
 const struct mbfl_identify_vtbl vtbl_identify_cp936 = {
 	mbfl_no_encoding_cp936,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_cp936
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c
index 7a8431219e..53a8aac2a6 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c
@@ -69,7 +69,6 @@ const mbfl_encoding mbfl_encoding_euc_cn = {
 const struct mbfl_identify_vtbl vtbl_identify_euccn = {
 	mbfl_no_encoding_euc_cn,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_euccn
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c
index ac12b3ed94..252a10a58d 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c
@@ -70,7 +70,6 @@ const mbfl_encoding mbfl_encoding_euc_jp = {
 const struct mbfl_identify_vtbl vtbl_identify_eucjp = {
 	mbfl_no_encoding_euc_jp,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_eucjp
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c
index 8efb49eff7..30d869cea5 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c
@@ -50,7 +50,6 @@ const mbfl_encoding mbfl_encoding_eucjp2004 = {
 const struct mbfl_identify_vtbl vtbl_identify_eucjp2004 = {
 	mbfl_no_encoding_eucjp2004,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_eucjp
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
index 7845fa2d1a..5798bff0fc 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
@@ -62,7 +62,6 @@ static const char *mbfl_encoding_eucjp_win_aliases[] = {"eucJP-open",
 const struct mbfl_identify_vtbl vtbl_identify_eucjpwin = {
 	mbfl_no_encoding_eucjp_win,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_eucjp_win
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c
index fef81b693b..e9b08e08c1 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c
@@ -68,7 +68,6 @@ const mbfl_encoding mbfl_encoding_euc_kr = {
 const struct mbfl_identify_vtbl vtbl_identify_euckr = {
 	mbfl_no_encoding_euc_kr,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_euckr
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c
index fe908c4ffb..c76eeb36bf 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c
@@ -70,7 +70,6 @@ const mbfl_encoding mbfl_encoding_euc_tw = {
 const struct mbfl_identify_vtbl vtbl_identify_euctw = {
 	mbfl_no_encoding_euc_tw,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_euctw
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
index 1bda813bb9..b94d664f40 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
@@ -51,7 +51,6 @@ const mbfl_encoding mbfl_encoding_gb18030 = {
 const struct mbfl_identify_vtbl vtbl_identify_gb18030 = {
 	mbfl_no_encoding_gb18030,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_gb18030
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.c b/ext/mbstring/libmbfl/filters/mbfilter_hz.c
index 1d95613b74..ceac85816c 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_hz.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.c
@@ -48,7 +48,6 @@ const mbfl_encoding mbfl_encoding_hz = {
 const struct mbfl_identify_vtbl vtbl_identify_hz = {
 	mbfl_no_encoding_hz,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_hz
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
index 9183e1e2a3..1e9757eae6 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
@@ -52,7 +52,6 @@ const mbfl_encoding mbfl_encoding_2022jpms = {
 const struct mbfl_identify_vtbl vtbl_identify_2022jpms = {
 	mbfl_no_encoding_2022jpms,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_2022jpms
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
index 8d8f917186..8df1d6f9b5 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_2022kr = {
 const struct mbfl_identify_vtbl vtbl_identify_2022kr = {
 	mbfl_no_encoding_2022kr,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_2022kr
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
index 7b9a663e12..b381f09bea 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
@@ -50,7 +50,6 @@ const mbfl_encoding mbfl_encoding_2022jp_2004 = {
 const struct mbfl_identify_vtbl vtbl_identify_2022jp_2004 = {
 	mbfl_no_encoding_2022jp_2004,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_2022jp_2004
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
index 0d4795942a..32ea47712e 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
@@ -54,7 +54,6 @@ const mbfl_encoding mbfl_encoding_2022jp_kddi = {
 const struct mbfl_identify_vtbl vtbl_identify_2022jp_kddi = {
 	mbfl_no_encoding_2022jp_kddi,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_2022jpms
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
index ce94528f4a..1549ba81bf 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
@@ -46,7 +46,6 @@ const mbfl_encoding mbfl_encoding_8859_1 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_1 = {
 	mbfl_no_encoding_8859_1,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
index cee8d60a8f..12cd960a88 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_10 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_10 = {
 	mbfl_no_encoding_8859_10,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
index daaf7bec50..25526263b8 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_13 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_13 = {
 	mbfl_no_encoding_8859_13,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
index edc5c72c85..06a2e4cd98 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_14 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_14 = {
 	mbfl_no_encoding_8859_14,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
index 38b77fc077..82b40796b8 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_15 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_15 = {
 	mbfl_no_encoding_8859_15,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
index 355c300466..80f1461364 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_16 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_16 = {
 	mbfl_no_encoding_8859_16,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
index 279ee694fc..86044e15d3 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_2 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_2 = {
 	mbfl_no_encoding_8859_2,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
index 853a7e202f..64eb9b5cf9 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_3 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_3 = {
 	mbfl_no_encoding_8859_3,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
index 264c0eae98..12a9f7cb10 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
@@ -47,8 +47,8 @@ const mbfl_encoding mbfl_encoding_8859_4 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_4 = {
 	mbfl_no_encoding_8859_4,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
-	mbfl_filt_ident_true };
+	mbfl_filt_ident_true
+};
 
 const struct mbfl_convert_vtbl vtbl_8859_4_wchar = {
 	mbfl_no_encoding_8859_4,
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
index f17da31260..70496d07e7 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_5 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_5 = {
 	mbfl_no_encoding_8859_5,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
index d184a71495..59d981e9c2 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_6 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_6 = {
 	mbfl_no_encoding_8859_6,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
index 029fed0729..73ead533ea 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_7 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_7 = {
 	mbfl_no_encoding_8859_7,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
index 16bc6e4f6e..05ca13f330 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_8 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_8 = {
 	mbfl_no_encoding_8859_8,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
index 2d45c1b91c..074f90bef2 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
@@ -47,7 +47,6 @@ const mbfl_encoding mbfl_encoding_8859_9 = {
 const struct mbfl_identify_vtbl vtbl_identify_8859_9 = {
 	mbfl_no_encoding_8859_9,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_true
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c
index 91ed552bcd..b08eec38b0 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c
@@ -61,14 +61,12 @@ const mbfl_encoding mbfl_encoding_2022jp = {
 const struct mbfl_identify_vtbl vtbl_identify_jis = {
 	mbfl_no_encoding_jis,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_jis
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_2022jp = {
 	mbfl_no_encoding_2022jp,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_2022jp
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c
index 850437710c..7790be65bb 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c
@@ -49,7 +49,6 @@ const mbfl_encoding mbfl_encoding_koi8r = {
 const struct mbfl_identify_vtbl vtbl_identify_koi8r = {
 	mbfl_no_encoding_koi8r,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_koi8r
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c
index fe495336cb..a62a1c596b 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c
@@ -46,7 +46,6 @@ const mbfl_encoding mbfl_encoding_koi8u = {
 const struct mbfl_identify_vtbl vtbl_identify_koi8u = {
 	mbfl_no_encoding_koi8u,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_koi8u
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c
index c6e83913da..dc5c2e4882 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c
@@ -73,7 +73,6 @@ const mbfl_encoding mbfl_encoding_sjis = {
 const struct mbfl_identify_vtbl vtbl_identify_sjis = {
 	mbfl_no_encoding_sjis,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_sjis
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
index 93324a4ae7..04e1d3af17 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
@@ -55,7 +55,6 @@ const mbfl_encoding mbfl_encoding_sjis2004 = {
 const struct mbfl_identify_vtbl vtbl_identify_sjis2004 = {
 	mbfl_no_encoding_sjis2004,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_sjis
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c
index 196ec0a59d..dc3d3692f4 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c
@@ -56,7 +56,6 @@ const mbfl_encoding mbfl_encoding_sjis_mac = {
 const struct mbfl_identify_vtbl vtbl_identify_sjis_mac = {
 	mbfl_no_encoding_sjis_mac,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_sjis
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
index ca84faae47..68084a0e0a 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
@@ -79,21 +79,18 @@ const mbfl_encoding mbfl_encoding_sjis_sb = {
 const struct mbfl_identify_vtbl vtbl_identify_sjis_docomo = {
 	mbfl_no_encoding_sjis_docomo,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_sjis
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_sjis_kddi = {
 	mbfl_no_encoding_sjis_kddi,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_sjis
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_sjis_sb = {
 	mbfl_no_encoding_sjis_sb,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_sjis
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c
index f8adc5474e..2535036e23 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c
@@ -70,7 +70,6 @@ const mbfl_encoding mbfl_encoding_sjis_open = {
 const struct mbfl_identify_vtbl vtbl_identify_sjis_open = {
 	mbfl_no_encoding_sjis_open,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_sjis_open
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c
index 403fc01081..5dc4aa81a9 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c
@@ -69,7 +69,6 @@ const mbfl_encoding mbfl_encoding_uhc = {
 const struct mbfl_identify_vtbl vtbl_identify_uhc = {
 	mbfl_no_encoding_uhc,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_uhc
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c
index 744c522807..b54bcf2b9c 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c
@@ -61,7 +61,6 @@ const mbfl_encoding mbfl_encoding_utf7 = {
 const struct mbfl_identify_vtbl vtbl_identify_utf7 = {
 	mbfl_no_encoding_utf7,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_utf7
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
index 26fd41def1..9e97d5b069 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
@@ -67,7 +67,6 @@ const mbfl_encoding mbfl_encoding_utf8 = {
 const struct mbfl_identify_vtbl vtbl_identify_utf8 = {
 	mbfl_no_encoding_utf8,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_utf8
 };
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
index 5d23b75d4c..ef8d4cc075 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
@@ -89,28 +89,24 @@ const mbfl_encoding mbfl_encoding_utf8_sb = {
 const struct mbfl_identify_vtbl vtbl_identify_utf8_docomo = {
 	mbfl_no_encoding_utf8_docomo,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_utf8
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_utf8_kddi_a = {
 	mbfl_no_encoding_utf8_kddi_a,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_utf8
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_utf8_kddi_b = {
 	mbfl_no_encoding_utf8_kddi_b,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_utf8
 };
 
 const struct mbfl_identify_vtbl vtbl_identify_utf8_sb = {
 	mbfl_no_encoding_utf8_sb,
 	mbfl_filt_ident_common_ctor,
-	mbfl_filt_ident_common_dtor,
 	mbfl_filt_ident_utf8
 };
 
diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c
index b5b760a2bc..813b5a6138 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfilter.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c
@@ -554,13 +554,6 @@ mbfl_identify_encoding(mbfl_string *string, const mbfl_encoding **elist, int eli
 		}
 	}
 
-	/* cleanup */
-	/* dtors should be called in reverse order */
-	i = num;
-	while (--i >= 0) {
-		mbfl_identify_filter_cleanup(&flist[i]);
-	}
-
 	efree((void *)flist);
 
 	return encoding;
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
index d151f6cc66..18144eb030 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
@@ -98,9 +98,8 @@
 static const struct mbfl_identify_vtbl vtbl_identify_false = {
 	mbfl_no_encoding_pass,
 	mbfl_filt_ident_false_ctor,
-	mbfl_filt_ident_common_dtor,
-	mbfl_filt_ident_false };
-
+	mbfl_filt_ident_false
+};
 
 static const struct mbfl_identify_vtbl *mbfl_identify_filter_list[] = {
 	&vtbl_identify_utf8,
@@ -164,8 +163,6 @@ static const struct mbfl_identify_vtbl *mbfl_identify_filter_list[] = {
 	NULL
 };
 
-
-
 /*
  * identify filter
  */
@@ -230,7 +227,6 @@ int mbfl_identify_filter_init2(mbfl_identify_filter *filter, const mbfl_encoding
 		vtbl = &vtbl_identify_false;
 	}
 	filter->filter_ctor = vtbl->filter_ctor;
-	filter->filter_dtor = vtbl->filter_dtor;
 	filter->filter_function = vtbl->filter_function;
 
 	/* constructor */
@@ -245,26 +241,15 @@ void mbfl_identify_filter_delete(mbfl_identify_filter *filter)
 		return;
 	}
 
-	mbfl_identify_filter_cleanup(filter);
 	efree((void*)filter);
 }
 
-void mbfl_identify_filter_cleanup(mbfl_identify_filter *filter)
-{
-	(*filter->filter_dtor)(filter);
-}
-
 void mbfl_filt_ident_common_ctor(mbfl_identify_filter *filter)
 {
 	filter->status = 0;
 	filter->flag = 0;
 }
 
-void mbfl_filt_ident_common_dtor(mbfl_identify_filter *filter)
-{
-	filter->status = 0;
-}
-
 int mbfl_filt_ident_false(int c, mbfl_identify_filter *filter)
 {
 	filter->flag = 1;	/* bad */
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.h b/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
index 238132f6a7..c9afd03fb4 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
@@ -41,7 +41,6 @@ typedef struct _mbfl_identify_filter mbfl_identify_filter;
 
 struct _mbfl_identify_filter {
 	void (*filter_ctor)(mbfl_identify_filter *filter);
-	void (*filter_dtor)(mbfl_identify_filter *filter);
 	int (*filter_function)(int c, mbfl_identify_filter *filter);
 	int status;
 	int flag;
@@ -52,7 +51,6 @@ struct _mbfl_identify_filter {
 struct mbfl_identify_vtbl {
 	enum mbfl_no_encoding encoding;
 	void (*filter_ctor)(mbfl_identify_filter *filter);
-	void (*filter_dtor)(mbfl_identify_filter *filter);
 	int (*filter_function)(int c, mbfl_identify_filter *filter);
 };
 
@@ -62,10 +60,8 @@ MBFLAPI extern mbfl_identify_filter * mbfl_identify_filter_new2(const mbfl_encod
 MBFLAPI extern void mbfl_identify_filter_delete(mbfl_identify_filter *filter);
 MBFLAPI extern int mbfl_identify_filter_init(mbfl_identify_filter *filter, enum mbfl_no_encoding encoding);
 MBFLAPI extern int mbfl_identify_filter_init2(mbfl_identify_filter *filter, const mbfl_encoding *encoding);
-MBFLAPI void mbfl_identify_filter_cleanup(mbfl_identify_filter *filter);
 
 MBFLAPI extern void mbfl_filt_ident_common_ctor(mbfl_identify_filter *filter);
-MBFLAPI extern void mbfl_filt_ident_common_dtor(mbfl_identify_filter *filter);
 MBFLAPI extern void mbfl_filt_ident_false_ctor(mbfl_identify_filter *filter);
 
 MBFLAPI extern int mbfl_filt_ident_false(int c, mbfl_identify_filter *filter);