com php-src: Separate mbfl filters into three categories: ext/mbstring/libmbfl/mbfl/mbfl_convert.c ext/mbstring/lib mbfl/mbfl/mbfl_convert.h

From: Date: Fri, 04 Aug 2017 20:22:58 +0000
Subject: com php-src: Separate mbfl filters into three categories: ext/mbstring/libmbfl/mbfl/mbfl_convert.c ext/mbstring/lib mbfl/mbfl/mbfl_convert.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98955@lists.php.net to get a copy of this message
Commit: e20fbd43bad65d10af1e0d648f7bfa0c40baa893 Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 4 Aug 2017 16:22:58 +0200 Parents: 840b77c02e23d3be8fdafc87ba192b1ab211245e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e20fbd43bad65d10af1e0d648f7bfa0c40baa893 Log: Separate mbfl filters into three categories Input filters, output filters and special filters. Changed paths: M ext/mbstring/libmbfl/mbfl/mbfl_convert.c M ext/mbstring/libmbfl/mbfl/mbfl_convert.h Diff: diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 69af147..0d9f25d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -110,170 +110,181 @@ static char mbfl_hexchar_table[] = { 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,0x45,0x46 }; -const struct mbfl_convert_vtbl *mbfl_convert_filter_list[] = { +/* Input filters going from encoding -> wchar */ +static const struct mbfl_convert_vtbl *mbfl_input_filter_list[] = { &vtbl_utf8_wchar, - &vtbl_wchar_utf8, &vtbl_eucjp_wchar, - &vtbl_wchar_eucjp, &vtbl_sjis_wchar, - &vtbl_wchar_sjis, &vtbl_sjis_open_wchar, - &vtbl_wchar_sjis_open, &vtbl_sjis2004_wchar, - &vtbl_wchar_sjis2004, &vtbl_cp51932_wchar, - &vtbl_wchar_cp51932, &vtbl_jis_wchar, - &vtbl_wchar_jis, &vtbl_jis_ms_wchar, - &vtbl_wchar_jis_ms, &vtbl_2022jp_wchar, - &vtbl_wchar_2022jp, &vtbl_2022jpms_wchar, - &vtbl_wchar_2022jpms, &vtbl_2022jp_2004_wchar, - &vtbl_wchar_2022jp_2004, &vtbl_2022jp_kddi_wchar, - &vtbl_wchar_2022jp_kddi, &vtbl_eucjpwin_wchar, - &vtbl_wchar_eucjpwin, &vtbl_eucjp2004_wchar, - &vtbl_wchar_eucjp2004, &vtbl_cp932_wchar, - &vtbl_wchar_cp932, &vtbl_sjis_docomo_wchar, - &vtbl_wchar_sjis_docomo, &vtbl_sjis_kddi_wchar, - &vtbl_wchar_sjis_kddi, &vtbl_sjis_sb_wchar, - &vtbl_wchar_sjis_sb, &vtbl_sjis_mac_wchar, - &vtbl_wchar_sjis_mac, &vtbl_utf8_docomo_wchar, - &vtbl_wchar_utf8_docomo, &vtbl_utf8_kddi_a_wchar, - &vtbl_wchar_utf8_kddi_a, &vtbl_utf8_kddi_b_wchar, - &vtbl_wchar_utf8_kddi_b, &vtbl_utf8_sb_wchar, - &vtbl_wchar_utf8_sb, &vtbl_euccn_wchar, - &vtbl_wchar_euccn, &vtbl_cp936_wchar, - &vtbl_wchar_cp936, &vtbl_gb18030_wchar, - &vtbl_wchar_gb18030, &vtbl_hz_wchar, - &vtbl_wchar_hz, &vtbl_euctw_wchar, - &vtbl_wchar_euctw, &vtbl_big5_wchar, - &vtbl_wchar_big5, &vtbl_cp950_wchar, - &vtbl_wchar_cp950, &vtbl_euckr_wchar, - &vtbl_wchar_euckr, &vtbl_uhc_wchar, - &vtbl_wchar_uhc, &vtbl_2022kr_wchar, - &vtbl_wchar_2022kr, &vtbl_cp1251_wchar, - &vtbl_wchar_cp1251, &vtbl_cp866_wchar, - &vtbl_wchar_cp866, &vtbl_koi8r_wchar, - &vtbl_wchar_koi8r, &vtbl_koi8u_wchar, - &vtbl_wchar_koi8u, &vtbl_cp1252_wchar, - &vtbl_wchar_cp1252, &vtbl_cp1254_wchar, - &vtbl_wchar_cp1254, &vtbl_cp50220_wchar, - &vtbl_wchar_cp50220, &vtbl_cp50220raw_wchar, - &vtbl_wchar_cp50220raw, &vtbl_cp50221_wchar, - &vtbl_wchar_cp50221, &vtbl_cp50222_wchar, - &vtbl_wchar_cp50222, &vtbl_ascii_wchar, - &vtbl_wchar_ascii, &vtbl_8859_1_wchar, - &vtbl_wchar_8859_1, &vtbl_8859_2_wchar, - &vtbl_wchar_8859_2, &vtbl_8859_3_wchar, - &vtbl_wchar_8859_3, &vtbl_8859_4_wchar, - &vtbl_wchar_8859_4, &vtbl_8859_5_wchar, - &vtbl_wchar_8859_5, &vtbl_8859_6_wchar, - &vtbl_wchar_8859_6, &vtbl_8859_7_wchar, - &vtbl_wchar_8859_7, &vtbl_8859_8_wchar, - &vtbl_wchar_8859_8, &vtbl_8859_9_wchar, - &vtbl_wchar_8859_9, &vtbl_8859_10_wchar, - &vtbl_wchar_8859_10, &vtbl_8859_13_wchar, - &vtbl_wchar_8859_13, &vtbl_8859_14_wchar, - &vtbl_wchar_8859_14, &vtbl_8859_15_wchar, - &vtbl_wchar_8859_15, - &vtbl_8bit_b64, - &vtbl_b64_8bit, - &vtbl_uuencode_8bit, - &vtbl_wchar_html, &vtbl_html_wchar, - &vtbl_8bit_qprint, - &vtbl_qprint_8bit, - &vtbl_8bit_7bit, - &vtbl_7bit_8bit, &vtbl_utf7_wchar, - &vtbl_wchar_utf7, &vtbl_utf7imap_wchar, - &vtbl_wchar_utf7imap, &vtbl_utf16_wchar, - &vtbl_wchar_utf16, &vtbl_utf16be_wchar, - &vtbl_wchar_utf16be, &vtbl_utf16le_wchar, - &vtbl_wchar_utf16le, &vtbl_utf32_wchar, - &vtbl_wchar_utf32, &vtbl_utf32be_wchar, - &vtbl_wchar_utf32be, &vtbl_utf32le_wchar, - &vtbl_wchar_utf32le, &vtbl_ucs4_wchar, - &vtbl_wchar_ucs4, &vtbl_ucs4be_wchar, - &vtbl_wchar_ucs4be, &vtbl_ucs4le_wchar, - &vtbl_wchar_ucs4le, &vtbl_ucs2_wchar, - &vtbl_wchar_ucs2, &vtbl_ucs2be_wchar, - &vtbl_wchar_ucs2be, &vtbl_ucs2le_wchar, - &vtbl_wchar_ucs2le, &vtbl_byte4be_wchar, - &vtbl_wchar_byte4be, &vtbl_byte4le_wchar, - &vtbl_wchar_byte4le, &vtbl_byte2be_wchar, - &vtbl_wchar_byte2be, &vtbl_byte2le_wchar, - &vtbl_wchar_byte2le, &vtbl_armscii8_wchar, - &vtbl_wchar_armscii8, &vtbl_cp850_wchar, + NULL +}; + +/* Output filters going from wchar -> encoding */ +static const struct mbfl_convert_vtbl *mbfl_output_filter_list[] = { + &vtbl_wchar_utf8, + &vtbl_wchar_eucjp, + &vtbl_wchar_sjis, + &vtbl_wchar_sjis_open, + &vtbl_wchar_sjis2004, + &vtbl_wchar_cp51932, + &vtbl_wchar_jis, + &vtbl_wchar_jis_ms, + &vtbl_wchar_2022jp, + &vtbl_wchar_2022jpms, + &vtbl_wchar_2022jp_2004, + &vtbl_wchar_2022jp_kddi, + &vtbl_wchar_eucjpwin, + &vtbl_wchar_eucjp2004, + &vtbl_wchar_cp932, + &vtbl_wchar_sjis_docomo, + &vtbl_wchar_sjis_kddi, + &vtbl_wchar_sjis_sb, + &vtbl_wchar_sjis_mac, + &vtbl_wchar_utf8_docomo, + &vtbl_wchar_utf8_kddi_a, + &vtbl_wchar_utf8_kddi_b, + &vtbl_wchar_utf8_sb, + &vtbl_wchar_euccn, + &vtbl_wchar_cp936, + &vtbl_wchar_gb18030, + &vtbl_wchar_hz, + &vtbl_wchar_euctw, + &vtbl_wchar_big5, + &vtbl_wchar_cp950, + &vtbl_wchar_euckr, + &vtbl_wchar_uhc, + &vtbl_wchar_2022kr, + &vtbl_wchar_cp1251, + &vtbl_wchar_cp866, + &vtbl_wchar_koi8r, + &vtbl_wchar_koi8u, + &vtbl_wchar_cp1252, + &vtbl_wchar_cp1254, + &vtbl_wchar_cp50220, + &vtbl_wchar_cp50220raw, + &vtbl_wchar_cp50221, + &vtbl_wchar_cp50222, + &vtbl_wchar_ascii, + &vtbl_wchar_8859_1, + &vtbl_wchar_8859_2, + &vtbl_wchar_8859_3, + &vtbl_wchar_8859_4, + &vtbl_wchar_8859_5, + &vtbl_wchar_8859_6, + &vtbl_wchar_8859_7, + &vtbl_wchar_8859_8, + &vtbl_wchar_8859_9, + &vtbl_wchar_8859_10, + &vtbl_wchar_8859_13, + &vtbl_wchar_8859_14, + &vtbl_wchar_8859_15, + &vtbl_wchar_html, + &vtbl_wchar_utf7, + &vtbl_wchar_utf7imap, + &vtbl_wchar_utf16, + &vtbl_wchar_utf16be, + &vtbl_wchar_utf16le, + &vtbl_wchar_utf32, + &vtbl_wchar_utf32be, + &vtbl_wchar_utf32le, + &vtbl_wchar_ucs4, + &vtbl_wchar_ucs4be, + &vtbl_wchar_ucs4le, + &vtbl_wchar_ucs2, + &vtbl_wchar_ucs2be, + &vtbl_wchar_ucs2le, + &vtbl_wchar_byte4be, + &vtbl_wchar_byte4le, + &vtbl_wchar_byte2be, + &vtbl_wchar_byte2le, + &vtbl_wchar_armscii8, &vtbl_wchar_cp850, + NULL +}; + +/* Special filters that don't fall in either category */ +static const struct mbfl_convert_vtbl *mbfl_special_filter_list[] = { + &vtbl_8bit_b64, + &vtbl_b64_8bit, + &vtbl_uuencode_8bit, + &vtbl_8bit_qprint, + &vtbl_qprint_8bit, + &vtbl_8bit_7bit, + &vtbl_7bit_8bit, &vtbl_pass, NULL }; @@ -589,6 +600,7 @@ mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter) const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encoding from, enum mbfl_no_encoding to) { const struct mbfl_convert_vtbl *vtbl; + const struct mbfl_convert_vtbl **list; int i; if (to == mbfl_no_encoding_base64 || @@ -601,8 +613,16 @@ const struct mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(enum mbfl_no_encod to = mbfl_no_encoding_8bit; } + if (to == mbfl_no_encoding_wchar) { + list = mbfl_input_filter_list; + } else if (from == mbfl_no_encoding_wchar) { + list = mbfl_output_filter_list; + } else { + list = mbfl_special_filter_list; + } + i = 0; - while ((vtbl = mbfl_convert_filter_list[i++]) != NULL){ + while ((vtbl = list[i++]) != NULL){ if (vtbl->from == from && vtbl->to == to) { return vtbl; } diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h index 0fe9e46..fd0b607 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h @@ -66,8 +66,6 @@ struct mbfl_convert_vtbl { void (*filter_copy)(mbfl_convert_filter *src, mbfl_convert_filter *dest); }; -MBFLAPI extern const struct mbfl_convert_vtbl *mbfl_convert_filter_list[]; - MBFLAPI extern mbfl_convert_filter *mbfl_convert_filter_new( const mbfl_encoding *from, const mbfl_encoding *to,

« previous php.cvs (#98955) next »