]> granicus.if.org Git - php/commitdiff
Fix [-Wmissing-field-initializers] compiler warning in mbstring
authorGeorge Peter Banyard <girgias@php.net>
Fri, 21 Feb 2020 12:19:09 +0000 (13:19 +0100)
committerGeorge Peter Banyard <girgias@php.net>
Fri, 21 Feb 2020 12:19:09 +0000 (13:19 +0100)
Add missing NULL pointer for mbfl_convert_vtbl struct.

65 files changed:
ext/mbstring/libmbfl/filters/mbfilter_7bit.c
ext/mbstring/libmbfl/filters/mbfilter_armscii8.c
ext/mbstring/libmbfl/filters/mbfilter_ascii.c
ext/mbstring/libmbfl/filters/mbfilter_base64.c
ext/mbstring/libmbfl/filters/mbfilter_big5.c
ext/mbstring/libmbfl/filters/mbfilter_byte2.c
ext/mbstring/libmbfl/filters/mbfilter_byte4.c
ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
ext/mbstring/libmbfl/filters/mbfilter_cp1252.c
ext/mbstring/libmbfl/filters/mbfilter_cp1254.c
ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
ext/mbstring/libmbfl/filters/mbfilter_cp51932.c
ext/mbstring/libmbfl/filters/mbfilter_cp850.c
ext/mbstring/libmbfl/filters/mbfilter_cp866.c
ext/mbstring/libmbfl/filters/mbfilter_cp932.c
ext/mbstring/libmbfl/filters/mbfilter_cp936.c
ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c
ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c
ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c
ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c
ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c
ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
ext/mbstring/libmbfl/filters/mbfilter_hz.c
ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c
ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c
ext/mbstring/libmbfl/filters/mbfilter_jis.c
ext/mbstring/libmbfl/filters/mbfilter_koi8r.c
ext/mbstring/libmbfl/filters/mbfilter_koi8u.c
ext/mbstring/libmbfl/filters/mbfilter_qprint.c
ext/mbstring/libmbfl/filters/mbfilter_sjis.c
ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c
ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c
ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c
ext/mbstring/libmbfl/filters/mbfilter_ucs2.c
ext/mbstring/libmbfl/filters/mbfilter_ucs4.c
ext/mbstring/libmbfl/filters/mbfilter_uhc.c
ext/mbstring/libmbfl/filters/mbfilter_utf16.c
ext/mbstring/libmbfl/filters/mbfilter_utf32.c
ext/mbstring/libmbfl/filters/mbfilter_utf7.c
ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c
ext/mbstring/libmbfl/filters/mbfilter_utf8.c
ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
ext/mbstring/libmbfl/filters/mbfilter_uuencode.c
ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c
ext/mbstring/libmbfl/mbfl/mbfilter_pass.c

index 0a4169a2d8fcea02904a0c081ead06749777fe9b..df7b4db6e64b156c7ebe92049a75bb3c93e9ec64 100644 (file)
@@ -52,7 +52,8 @@ const struct mbfl_convert_vtbl vtbl_8bit_7bit = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_any_7bit,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_7bit_8bit = {
@@ -61,7 +62,8 @@ const struct mbfl_convert_vtbl vtbl_7bit_8bit = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_7bit_any,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index 599c1485fbb299ed15eb2ae6d2ec209800591cbb..41ddf41b1940bed9f53dc61a8e949071bf843137 100644 (file)
@@ -62,7 +62,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_armscii8 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_armscii8,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_armscii8_wchar = {
@@ -71,7 +72,8 @@ const struct mbfl_convert_vtbl vtbl_armscii8_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_armscii8_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 71bd5b46fa198a5875dd494c6185b7337cf9923a..e31d968535706fbce35803a21cc62d3315fdf98b 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_ascii_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_ascii_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_ascii = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ascii = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_ascii,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index f79a3eb8e96a6e5737d6cb9c81567513d64d421b..765afe522e4633a70ed197462354baf7f55a64d3 100644 (file)
@@ -52,7 +52,8 @@ const struct mbfl_convert_vtbl vtbl_8bit_b64 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_base64enc,
-       mbfl_filt_conv_base64enc_flush
+       mbfl_filt_conv_base64enc_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_b64_8bit = {
@@ -61,7 +62,8 @@ const struct mbfl_convert_vtbl vtbl_b64_8bit = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_base64dec,
-       mbfl_filt_conv_base64dec_flush
+       mbfl_filt_conv_base64dec_flush,
+       NULL,
 };
 
 
index 6c071e0e998c755800e23228068a5d301be5f45b..ad27b58bd32021bb360901542279b8d6a838f71f 100644 (file)
@@ -101,7 +101,8 @@ const struct mbfl_convert_vtbl vtbl_big5_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_big5_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_big5 = {
@@ -110,7 +111,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_big5 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_big5,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL
 };
 
 const struct mbfl_convert_vtbl vtbl_cp950_wchar = {
@@ -119,7 +121,8 @@ const struct mbfl_convert_vtbl vtbl_cp950_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_big5_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp950 = {
@@ -128,7 +131,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp950 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_big5,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 572b9fab84f0f1d1280f38d4636adfbe0de89f69..fcdd4a4c450cff07de180569b42a08d049a7a1a7 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_byte2be_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_byte2be_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_byte2be = {
@@ -72,7 +73,9 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte2be = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_byte2be,
-       mbfl_filt_conv_common_flush };
+       mbfl_filt_conv_common_flush,
+       NULL,
+};
 
 const struct mbfl_convert_vtbl vtbl_byte2le_wchar = {
        mbfl_no_encoding_byte2le,
@@ -80,7 +83,9 @@ const struct mbfl_convert_vtbl vtbl_byte2le_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_byte2le_wchar,
-       mbfl_filt_conv_common_flush };
+       mbfl_filt_conv_common_flush,
+       NULL,
+};
 
 const struct mbfl_convert_vtbl vtbl_wchar_byte2le = {
        mbfl_no_encoding_wchar,
@@ -88,7 +93,9 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte2le = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_byte2le,
-       mbfl_filt_conv_common_flush };
+       mbfl_filt_conv_common_flush,
+       NULL,
+};
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
 
index ed09bb3fdec348fa9e5926329cc8d992a0bba184..4c2835ab1afe874b21c01c63734bba58f3eb80a4 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_byte4be_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_byte4be_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_byte4be = {
@@ -72,7 +73,9 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4be = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_byte4be,
-       mbfl_filt_conv_common_flush };
+       mbfl_filt_conv_common_flush,
+       NULL,
+};
 
 const struct mbfl_convert_vtbl vtbl_byte4le_wchar = {
        mbfl_no_encoding_byte4le,
@@ -80,7 +83,8 @@ const struct mbfl_convert_vtbl vtbl_byte4le_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_byte4le_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_byte4le = {
@@ -89,7 +93,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4le = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_byte4le,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index fec1b6f807a2e4256136bbf0f5e991a2d2f3d443..806102dfc37e9d2fff5ea131e9b32b07dac6e1b4 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1251 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp1251,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_cp1251_wchar = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_cp1251_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp1251_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index a668364a5b8a3614ca9115ac51aede5f073ad5d3..c0cf0f43f08fb70a785b988cc2b9b5c54119aad7 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_cp1252_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp1252_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp1252 = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1252 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp1252,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 89fc4b6f59a037758c38fdf13dc8801111ed737e..918428fbfb83a2bd880fca0d7ba1f32b0e3ba4b7 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_cp1254_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp1254_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp1254 = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1254 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp1254,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index dd3d1949fa45dcb1a26d64917e35d9b4416161d9..4fa23344445f217d8c7d40e0759e4feff2df1d8b 100644 (file)
@@ -145,6 +145,7 @@ const struct mbfl_convert_vtbl vtbl_jis_ms_wchar = {
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis_ms_wchar,
        mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_jis_ms = {
@@ -153,7 +154,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_jis_ms = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_jis_ms,
-       mbfl_filt_conv_any_jis_flush
+       mbfl_filt_conv_any_jis_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_cp50220_wchar = {
@@ -162,7 +164,8 @@ const struct mbfl_convert_vtbl vtbl_cp50220_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis_ms_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp50220 = {
@@ -181,7 +184,8 @@ const struct mbfl_convert_vtbl vtbl_cp50220raw_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis_ms_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp50220raw = {
@@ -200,7 +204,8 @@ const struct mbfl_convert_vtbl vtbl_cp50221_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis_ms_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp50221 = {
@@ -209,7 +214,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp50221 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp50221,
-       mbfl_filt_conv_any_jis_flush
+       mbfl_filt_conv_any_jis_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_cp50222_wchar = {
@@ -218,7 +224,8 @@ const struct mbfl_convert_vtbl vtbl_cp50222_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis_ms_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp50222 = {
@@ -227,7 +234,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp50222 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp50222,
-       mbfl_filt_conv_wchar_cp50222_flush
+       mbfl_filt_conv_wchar_cp50222_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 189feb2141c1651982a750ccc776ead320aca94c..f099f51389b4871e2945fa5f031f74e87d843b9a 100644 (file)
@@ -86,7 +86,8 @@ const struct mbfl_convert_vtbl vtbl_cp51932_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp51932_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp51932 = {
@@ -95,7 +96,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp51932 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp51932,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 38f42b8695991bcc138d3aa6ff70d1ac8a2e82e9..187ee0f468c725b52a94c919ad0264115403634b 100644 (file)
@@ -59,7 +59,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp850 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp850,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_cp850_wchar = {
@@ -68,7 +69,8 @@ const struct mbfl_convert_vtbl vtbl_cp850_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp850_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 6f2d602112f36693013e7258ffdde65fc91c1547..3a135558eb896bf142f0322d96b7e0e0639d307b 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp866 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp866,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_cp866_wchar = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_cp866_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp866_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index dcadc4eaa71de40a58abcff0f69facfd3df4e207..49590622d799f1f4d33763c686e3c9ebb8b9116b 100644 (file)
@@ -84,7 +84,8 @@ const struct mbfl_convert_vtbl vtbl_cp932_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp932_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp932 = {
@@ -93,7 +94,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp932 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp932,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 95eb6e801514df0c5180fa6b97e17d6683a4198a..6c22dd0c135b676f04a18fc4b88dbe9411208555 100644 (file)
@@ -83,7 +83,8 @@ const struct mbfl_convert_vtbl vtbl_cp936_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_cp936_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_cp936 = {
@@ -92,7 +93,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp936 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_cp936,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index 13a14855ec1897178954034463faa7ee41d3c101..eb39799b87ee054f6cb1751513b50c6c4cac133f 100644 (file)
@@ -83,7 +83,8 @@ const struct mbfl_convert_vtbl vtbl_euccn_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_euccn_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_euccn = {
@@ -92,7 +93,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_euccn = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_euccn,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index aeeac851e44bc2cf6b35bbf6aa212e7ba444ca2f..c5a884ea0ed1f360f9166f6dabb105d19a4424ef 100644 (file)
@@ -84,7 +84,8 @@ const struct mbfl_convert_vtbl vtbl_eucjp_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_eucjp_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_eucjp = {
@@ -93,7 +94,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjp = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_eucjp,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index d68a6cc38d340fe2b4b7bdb12930ecd037f710f9..c8eff57e169bcfa0c16b22f368716f21fe2a2365 100644 (file)
@@ -64,7 +64,8 @@ const struct mbfl_convert_vtbl vtbl_eucjp2004_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis2004_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_eucjp2004 = {
@@ -73,5 +74,6 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjp2004 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_jis2004,
-       mbfl_filt_conv_jis2004_flush
+       mbfl_filt_conv_jis2004_flush,
+       NULL,
 };
index 4c26e38fa869951501dd3e3ac4ecfdf1de0a3ba1..ac032770d066d48619fa3afbbfbd8bf65df7207d 100644 (file)
@@ -87,7 +87,8 @@ const struct mbfl_convert_vtbl vtbl_eucjpwin_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_eucjpwin_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_eucjpwin = {
@@ -96,7 +97,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjpwin = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_eucjpwin,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 8509ef4dd2ca027c9e8eefee51705a13f5028c15..9e7925904b8d3a4698cca4cb0360a79995e88701 100644 (file)
@@ -82,7 +82,8 @@ const struct mbfl_convert_vtbl vtbl_euckr_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_euckr_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_euckr = {
@@ -91,7 +92,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_euckr = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_euckr,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index 290d8b83fbddfeb99177e095c08e06f6073f73f7..f1174eab77fc7c66911a7263cc2cb1ac3dc13c05 100644 (file)
@@ -84,7 +84,8 @@ const struct mbfl_convert_vtbl vtbl_euctw_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_euctw_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_euctw = {
@@ -93,7 +94,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_euctw = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_euctw,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index f8d2e1954a8d1ec57d40cdc0dd04f96c53e03e06..dcee840dbd8088765c15e2aebe0097be23b15603 100644 (file)
@@ -65,7 +65,8 @@ const struct mbfl_convert_vtbl vtbl_gb18030_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_gb18030_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_gb18030 = {
@@ -74,7 +75,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_gb18030 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_gb18030,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 4213cadb7aa7e41b512b08810b95bb2a49f8f484..49162ac1b36eafa22f9428f3897be44e888bc28c 100644 (file)
@@ -74,7 +74,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_html = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_html_enc,
-       mbfl_filt_conv_html_enc_flush
+       mbfl_filt_conv_html_enc_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_html_wchar = {
@@ -84,7 +85,8 @@ const struct mbfl_convert_vtbl vtbl_html_wchar = {
        mbfl_filt_conv_html_dec_dtor,
        mbfl_filt_conv_html_dec,
        mbfl_filt_conv_html_dec_flush,
-       mbfl_filt_conv_html_dec_copy };
+       mbfl_filt_conv_html_dec_copy,
+};
 
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 0e360726ed0e2f4fe1bc44602c0569558fbcd53f..13abc427666f1e08c28027f213e16dc09bfd56a5 100644 (file)
@@ -62,7 +62,8 @@ const struct mbfl_convert_vtbl vtbl_hz_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_hz_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_hz = {
@@ -71,7 +72,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_hz = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_hz,
-       mbfl_filt_conv_any_hz_flush
+       mbfl_filt_conv_any_hz_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index cec21c26f2ae1aa257040e4bbe06bb8c031fe59d..8c5605937b743a847539dbd4a53481403ff8c1e1 100644 (file)
@@ -66,7 +66,8 @@ const struct mbfl_convert_vtbl vtbl_2022jpms_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_2022jpms_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_2022jpms = {
@@ -75,7 +76,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jpms = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_2022jpms,
-       mbfl_filt_conv_any_2022jpms_flush
+       mbfl_filt_conv_any_2022jpms_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index bd1227e6a56270ac7eec7aad2b095b135d537ed6..3fb856c2b7f86fd938589c1e52017fb2d77f9790 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022kr = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_2022kr,
-       mbfl_filt_conv_any_2022kr_flush
+       mbfl_filt_conv_any_2022kr_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_2022kr_wchar = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_2022kr_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_2022kr_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index b3c5f60f698e3b8dfa77770edcfdd327eb35c607..79f88300eb9b96f9558377314d83b104c9bc4bd1 100644 (file)
@@ -64,7 +64,8 @@ const struct mbfl_convert_vtbl vtbl_2022jp_2004_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis2004_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_2022jp_2004 = {
@@ -73,7 +74,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jp_2004 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_jis2004,
-       mbfl_filt_conv_jis2004_flush
+       mbfl_filt_conv_jis2004_flush,
+       NULL,
 };
 
 static int mbfl_filt_ident_2022jp_2004(int c, mbfl_identify_filter *filter)
index ecfdee110965e6a9715129ad0be2cfb4a3cf3f1e..bf45a8065c05dbfca93a73bcafad8ed2356a03c1 100644 (file)
@@ -68,7 +68,8 @@ const struct mbfl_convert_vtbl vtbl_2022jp_kddi_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_2022jp_mobile_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_2022jp_kddi = {
@@ -77,7 +78,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jp_kddi = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_2022jp_mobile,
-       mbfl_filt_conv_any_jis_flush
+       mbfl_filt_conv_any_jis_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 2b75b51e58ce8eb40bb81e8f588edd76ded75b08..5d593887443a63cc16e29174404e93066ec85b50 100644 (file)
@@ -60,7 +60,8 @@ const struct mbfl_convert_vtbl vtbl_8859_1_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_1_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_1 = {
@@ -69,7 +70,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_1 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_1,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index bb050df3286ff466aabe1da82c83f08a644b9c21..15451b9d42d2c3bdf6e1a465464ca4ca9669ac48 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_10_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_10_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_10 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_10 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_10,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 5398abd4f7b033325a25821a10fc444704de8714..381d4f6b5d75014a941511a3c3a6a1605be32639 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_13_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_13_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_13 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_13 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_13,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index bd07ac7b61109ae38e8fc94e1f2e639a0211bfb1..ed2d5b309874ee95f7044fdfb78bdd7583cbf2ce 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_14_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_14_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_14 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_14 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_14,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index a564ac4fcf122a700f7e0f50750f5706a4033216..4cae1ec5f6dfb5798cb19e37509b6f4c638c3181 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_15_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_15_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_15 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_15 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_15,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 26008220066eee791d1d864b7f39cb556f623e24..b2370b41322d96c600dc8c621d18af5a759c1c4c 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_16_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_16_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_16 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_16 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_16,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 245cc914dc617e15450312f8805824fa57ff0227..1496eb0aade29c3fc71241099c75aae3454e0532 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_2_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_2_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_2 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_2 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_2,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index 557983b7a7ca699235ad2a6fd3633bcd32040a18..40866469684217f307034399f470b8534a4ec6f3 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_3_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_3_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_3 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_3 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_3,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index f481e01465799ca3cd4393319a8b43bb942d07e2..477c18d2592e340e2394d0977a270a90df292e02 100644 (file)
@@ -60,7 +60,8 @@ const struct mbfl_convert_vtbl vtbl_8859_4_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_4_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_4 = {
@@ -69,7 +70,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_4 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_4,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index d00a0afff472679487e65d24fd17dc11c1aca17c..9934dbb5c79aefed055274d349ec5d3b33549fcf 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_5_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_5_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_5 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_5 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_5,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index 45120cf487f67ea379183974105e22e8213e93af..1235fdbd237168875867fa253fcb6d89dae18bc1 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_6_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_6_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_6 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_6 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_6,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index 79fe4d75099bc098a80dea7f6da0b43519d51893..f62018b9c2a84c7547ac1e4ed644c20e17edeef3 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_7_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_7_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_7 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_7 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_7,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index a7124d3e4ea7f7c23e4137debd9509218e9d938b..1ed1cfc50d892db1520a705e905b276b8f24870f 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_8_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_8_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_8 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_8 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_8,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index ba71bfd6a4f2fc0859d150fe3c293aa98db4700d..3b686a42be5d350245f5c0d20f35a5ef6cd04b11 100644 (file)
@@ -61,7 +61,8 @@ const struct mbfl_convert_vtbl vtbl_8859_9_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8859_9_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8859_9 = {
@@ -70,7 +71,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8859_9 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8859_9,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index f3bd3f814129d14a4f293eae63caa92890602724..93cb1e88ac541862446f6f88ae4eedcdb2c2d918 100644 (file)
@@ -82,7 +82,8 @@ const struct mbfl_convert_vtbl vtbl_jis_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_jis = {
@@ -91,7 +92,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_jis = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_jis,
-       mbfl_filt_conv_any_jis_flush
+       mbfl_filt_conv_any_jis_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_2022jp_wchar = {
@@ -100,7 +102,8 @@ const struct mbfl_convert_vtbl vtbl_2022jp_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_2022jp = {
@@ -109,7 +112,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_2022jp = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_2022jp,
-       mbfl_filt_conv_any_jis_flush
+       mbfl_filt_conv_any_jis_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index a9a4479aed2185bec6b3ae63f3f42212c7b0f91a..04dcf2d639a239f8fbafc5edeac955d94f8a3b9f 100644 (file)
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_koi8r = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_koi8r,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_koi8r_wchar = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_koi8r_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_koi8r_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 675ea03955d3a503c0efccd15becf89201375ba9..d1e310bde72c90ec73eb7f3101b19e26793f40ad 100644 (file)
@@ -60,7 +60,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_koi8u = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_koi8u,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_koi8u_wchar = {
@@ -69,7 +70,8 @@ const struct mbfl_convert_vtbl vtbl_koi8u_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_koi8u_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 0d10ea49f8136b5ada4c52bb485e395ca21e13a2..42dfde108b92830588644e02a750f8e48c651e9d 100644 (file)
@@ -54,7 +54,9 @@ const struct mbfl_convert_vtbl vtbl_8bit_qprint = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_qprintenc,
-       mbfl_filt_conv_qprintenc_flush };
+       mbfl_filt_conv_qprintenc_flush,
+       NULL,
+};
 
 const struct mbfl_convert_vtbl vtbl_qprint_8bit = {
        mbfl_no_encoding_qprint,
@@ -62,7 +64,9 @@ const struct mbfl_convert_vtbl vtbl_qprint_8bit = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_qprintdec,
-       mbfl_filt_conv_qprintdec_flush };
+       mbfl_filt_conv_qprintdec_flush,
+       NULL,
+};
 
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 73ded6c7043e563500d29a07e908a4cbc17b5a40..f64fd13817da37fab66211f2b50ff0e8d58be22e 100644 (file)
@@ -87,7 +87,8 @@ const struct mbfl_convert_vtbl vtbl_sjis_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_sjis_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_sjis = {
@@ -96,7 +97,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_sjis,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index ac476b3e19af82b5d40c4b19eeebc690db42f016..481ae557cc0041264eeda0256c1b050a91fc4c2b 100644 (file)
@@ -69,7 +69,8 @@ const struct mbfl_convert_vtbl vtbl_sjis2004_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_jis2004_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_sjis2004 = {
@@ -78,7 +79,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis2004 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_jis2004,
-       mbfl_filt_conv_jis2004_flush
+       mbfl_filt_conv_jis2004_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 8bc8e6e68f747218d04198f2c3684049072c86e0..e52ea2f321c47b37a2df0d0a07e68d9c8a7f74d6 100644 (file)
@@ -70,7 +70,8 @@ const struct mbfl_convert_vtbl vtbl_sjis_mac_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_sjis_mac_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_sjis_mac = {
@@ -79,7 +80,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_mac = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_sjis_mac,
-       mbfl_filt_conv_sjis_mac_flush
+       mbfl_filt_conv_sjis_mac_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 316250ddb2133cc79c0848d5d1a9bc1019bd42a8..e3faa3fe20c8ad19122982e63750aefbf9005e6d 100644 (file)
@@ -107,7 +107,8 @@ const struct mbfl_convert_vtbl vtbl_sjis_docomo_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_sjis_mobile_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_sjis_docomo = {
@@ -116,7 +117,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_docomo = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_sjis_mobile,
-       mbfl_filt_conv_sjis_mobile_flush
+       mbfl_filt_conv_sjis_mobile_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_sjis_kddi_wchar = {
@@ -125,7 +127,8 @@ const struct mbfl_convert_vtbl vtbl_sjis_kddi_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_sjis_mobile_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_sjis_kddi = {
@@ -134,7 +137,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_kddi = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_sjis_mobile,
-       mbfl_filt_conv_sjis_mobile_flush
+       mbfl_filt_conv_sjis_mobile_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_sjis_sb_wchar = {
@@ -143,7 +147,8 @@ const struct mbfl_convert_vtbl vtbl_sjis_sb_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_sjis_mobile_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_sjis_sb = {
@@ -152,7 +157,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_sb = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_sjis_mobile,
-       mbfl_filt_conv_sjis_mobile_flush
+       mbfl_filt_conv_sjis_mobile_flush,
+       NULL,
 };
 
 static const char nflags_s[10][2] = {"CN","DE","ES","FR","GB","IT","JP","KR","RU","US"};
index 855b6eda8b8dc4d20e7c71fd9763e16c45a58e51..a3cea997447e4071f7c7b92bc30be67da4ad6686 100644 (file)
@@ -84,7 +84,8 @@ const struct mbfl_convert_vtbl vtbl_sjis_open_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_sjis_open_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_sjis_open = {
@@ -93,7 +94,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_open = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_sjis_open,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index b99c658e4de8901a029e0e48b2f1e7f491400cb6..e62472c6ac4db78dc84ec2e4189dd7db307bc70c 100644 (file)
@@ -297,5 +297,6 @@ const struct mbfl_convert_vtbl vtbl_tl_jisx0201_jisx0208 = {
        mbfl_filt_tl_jisx0201_jisx0208_init,
        mbfl_filt_tl_jisx0201_jisx0208_cleanup,
        mbfl_filt_tl_jisx0201_jisx0208,
-       mbfl_filt_tl_jisx0201_jisx0208_flush
+       mbfl_filt_tl_jisx0201_jisx0208_flush,
+       NULL,
 };
index da42ef10f527f409168bdc4df0b84ae768016f95..ffe493982b48a363eddc6ab9ad3fee9d5e693ee6 100644 (file)
@@ -75,7 +75,8 @@ const struct mbfl_convert_vtbl vtbl_ucs2_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_ucs2_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_ucs2 = {
@@ -84,7 +85,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs2 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_ucs2be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_ucs2be_wchar = {
@@ -93,7 +95,8 @@ const struct mbfl_convert_vtbl vtbl_ucs2be_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_ucs2be_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_ucs2be = {
@@ -102,7 +105,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs2be = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_ucs2be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_ucs2le_wchar = {
@@ -111,7 +115,8 @@ const struct mbfl_convert_vtbl vtbl_ucs2le_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_ucs2le_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_ucs2le = {
@@ -120,7 +125,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs2le = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_ucs2le,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 34715cd560f6b0f205ea0938f5e367770c7245f0..696788e5597be5e2cd2593b5493d6a23cf64116d 100644 (file)
@@ -75,7 +75,8 @@ const struct mbfl_convert_vtbl vtbl_ucs4_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_ucs4_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_ucs4 = {
@@ -84,7 +85,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs4 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_ucs4be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_ucs4be_wchar = {
@@ -93,7 +95,8 @@ const struct mbfl_convert_vtbl vtbl_ucs4be_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_ucs4be_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_ucs4be = {
@@ -102,7 +105,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs4be = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_ucs4be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_ucs4le_wchar = {
@@ -111,7 +115,8 @@ const struct mbfl_convert_vtbl vtbl_ucs4le_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_ucs4le_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_ucs4le = {
@@ -120,7 +125,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ucs4le = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_ucs4le,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 
index 7995c812c257821cff19ad7c2df5267089d6bd24..1827292e0fa6f0d04602e062caaaeffc73541bb1 100644 (file)
@@ -83,7 +83,8 @@ const struct mbfl_convert_vtbl vtbl_uhc_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_uhc_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_uhc = {
@@ -92,7 +93,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_uhc = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_uhc,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 961bfdcaf3a1da8175d548b951b160f22bc8036f..f5779e06c7db3decc799f91dae070739ad5601a0 100644 (file)
@@ -75,7 +75,8 @@ const struct mbfl_convert_vtbl vtbl_utf16_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf16_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf16 = {
@@ -84,7 +85,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf16 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf16be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_utf16be_wchar = {
@@ -93,7 +95,8 @@ const struct mbfl_convert_vtbl vtbl_utf16be_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf16be_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf16be = {
@@ -102,7 +105,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf16be = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf16be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_utf16le_wchar = {
@@ -111,7 +115,8 @@ const struct mbfl_convert_vtbl vtbl_utf16le_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf16le_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf16le = {
@@ -120,7 +125,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf16le = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf16le,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 3281cf9494a46faa5a71741ccf39e85ad78a8a14..460794f9d64d01ab4b083182578ffc256f11789a 100644 (file)
@@ -75,7 +75,8 @@ const struct mbfl_convert_vtbl vtbl_utf32_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf32_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf32 = {
@@ -84,7 +85,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf32 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf32be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_utf32be_wchar = {
@@ -93,7 +95,8 @@ const struct mbfl_convert_vtbl vtbl_utf32be_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf32be_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf32be = {
@@ -102,7 +105,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf32be = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf32be,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_utf32le_wchar = {
@@ -111,7 +115,8 @@ const struct mbfl_convert_vtbl vtbl_utf32le_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf32le_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf32le = {
@@ -120,7 +125,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf32le = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf32le,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 901c1a4a8b2be08324a89dd9040bb51978d9cd38..424798d74594bebb7a47a1a9c2446ceb1e0b3025 100644 (file)
@@ -75,7 +75,8 @@ const struct mbfl_convert_vtbl vtbl_utf7_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf7_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf7 = {
@@ -84,7 +85,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf7 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf7,
-       mbfl_filt_conv_wchar_utf7_flush
+       mbfl_filt_conv_wchar_utf7_flush,
+       NULL,
 };
 
 
index 4203124cc3ce4acf5faa6ef3fba9d77e4eb22a66..d4ad592ca3ac0f2609983c015ef217f87a4bc148 100644 (file)
@@ -51,7 +51,9 @@ const struct mbfl_convert_vtbl vtbl_utf7imap_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf7imap_wchar,
-       mbfl_filt_conv_common_flush };
+       mbfl_filt_conv_common_flush,
+       NULL,
+};
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf7imap = {
        mbfl_no_encoding_wchar,
@@ -59,7 +61,9 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf7imap = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf7imap,
-       mbfl_filt_conv_wchar_utf7imap_flush };
+       mbfl_filt_conv_wchar_utf7imap_flush,
+       NULL,
+};
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
 
index 05815bbdb04d15029d584c71e75380f544ee5ca4..f624e153a42e52ff1da16a2b6061dd98d5da5426 100644 (file)
@@ -81,7 +81,8 @@ const struct mbfl_convert_vtbl vtbl_utf8_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf8_wchar,
-       mbfl_filt_conv_utf8_wchar_flush
+       mbfl_filt_conv_utf8_wchar_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8 = {
@@ -90,7 +91,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8 = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf8,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 3e166609e750bf7271ac51b181d03cc8b1b017e3..173e9f3b9b958ad36840c505157a2d09f4a47921 100644 (file)
@@ -124,7 +124,8 @@ const struct mbfl_convert_vtbl vtbl_utf8_docomo_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf8_mobile_wchar,
-       mbfl_filt_conv_utf8_wchar_flush
+       mbfl_filt_conv_utf8_wchar_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_docomo = {
@@ -133,7 +134,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_docomo = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf8_mobile,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_utf8_kddi_a_wchar = {
@@ -142,7 +144,8 @@ const struct mbfl_convert_vtbl vtbl_utf8_kddi_a_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf8_mobile_wchar,
-       mbfl_filt_conv_utf8_wchar_flush
+       mbfl_filt_conv_utf8_wchar_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_a = {
@@ -151,7 +154,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_a = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf8_mobile,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_utf8_kddi_b_wchar = {
@@ -160,7 +164,8 @@ const struct mbfl_convert_vtbl vtbl_utf8_kddi_b_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf8_mobile_wchar,
-       mbfl_filt_conv_utf8_wchar_flush
+       mbfl_filt_conv_utf8_wchar_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_b = {
@@ -169,7 +174,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_b = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf8_mobile,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_utf8_sb_wchar = {
@@ -178,7 +184,8 @@ const struct mbfl_convert_vtbl vtbl_utf8_sb_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_utf8_mobile_wchar,
-       mbfl_filt_conv_utf8_wchar_flush
+       mbfl_filt_conv_utf8_wchar_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_sb = {
@@ -187,7 +194,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_sb = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_utf8_mobile,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index 0645ef68c64cce8423041ba82f9703fde272eb31..b6601fda9f7ad52ac638c5cb416f519dee9d83c5 100644 (file)
@@ -51,7 +51,8 @@ const struct mbfl_convert_vtbl vtbl_uuencode_8bit = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_uudec,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement)  do { if ((statement) < 0) return (-1); } while (0)
index a6a4e9f01fbe429cbc9b538e34a14c452f3bbed5..98c9644f9dab0d2cf591dd1be1ed26e2a68b5150 100644 (file)
@@ -60,7 +60,8 @@ const struct mbfl_convert_vtbl vtbl_8bit_wchar = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_8bit_wchar,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_8bit = {
@@ -69,7 +70,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_8bit = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_wchar_8bit,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 #define CK(statement) do { if ((statement) < 0) return (-1); } while (0)
index 343a968794e99ae3f581868a4336c4f12a039733..34543786d8258bf9b0256938e460663295e0e8c9 100644 (file)
@@ -55,7 +55,8 @@ const struct mbfl_convert_vtbl vtbl_pass = {
        mbfl_filt_conv_common_ctor,
        mbfl_filt_conv_common_dtor,
        mbfl_filt_conv_pass,
-       mbfl_filt_conv_common_flush
+       mbfl_filt_conv_common_flush,
+       NULL,
 };
 
 int mbfl_filt_conv_pass(int c, mbfl_convert_filter *filter)