From: Rui Hirokawa Date: Wed, 31 Aug 2011 13:19:03 +0000 (+0000) Subject: MFH: added alias for *-mobile encodings. X-Git-Tag: php-5.4.0beta1~305 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38265497708ed5f9188f548e69920f15bcd2e85a;p=php MFH: added alias for *-mobile encodings. --- diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c index 4c8d974714..aa4e6912a0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c @@ -42,11 +42,13 @@ extern int mbfl_filt_conv_any_jis_flush(mbfl_convert_filter *filter); extern int mbfl_filt_ident_2022jpms(int c, mbfl_identify_filter *filter); +static const char *mbfl_encoding_2022jp_kddi_aliases[] = {"ISO-2022-JP-KDDI", NULL}; + const mbfl_encoding mbfl_encoding_2022jp_kddi = { mbfl_no_encoding_2022jp_kddi, "ISO-2022-JP-MOBILE#KDDI", "ISO-2022-JP", - NULL, + mbfl_encoding_2022jp_kddi_aliases, NULL, MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE }; diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index 37ea55e4b8..fee36bcaa0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -44,11 +44,15 @@ extern int mbfl_bisec_srch2(int w, const unsigned short tbl[], int n); extern int mbfl_filt_ident_sjis(int c, mbfl_identify_filter *filter); extern const unsigned char mblen_table_sjis[]; +static const char *mbfl_encoding_sjis_docomo_aliases[] = {"SJIS-DOCOMO", "shift_jis-imode", "x-sjis-emoji-docomo", NULL}; +static const char *mbfl_encoding_sjis_kddi_aliases[] = {"SJIS-KDDI", "shift_jis-kddi", "x-sjis-emoji-kddi", NULL}; +static const char *mbfl_encoding_sjis_sb_aliases[] = {"SJIS-SOFTBANK", "shift_jis-softbank", "x-sjis-emoji-softbank", NULL}; + const mbfl_encoding mbfl_encoding_sjis_docomo = { mbfl_no_encoding_sjis_docomo, "SJIS-Mobile#DOCOMO", "Shift_JIS", - NULL, + mbfl_encoding_sjis_docomo_aliases, mblen_table_sjis, MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE }; @@ -57,7 +61,7 @@ const mbfl_encoding mbfl_encoding_sjis_kddi = { mbfl_no_encoding_sjis_kddi, "SJIS-Mobile#KDDI", "Shift_JIS", - NULL, + mbfl_encoding_sjis_kddi_aliases, mblen_table_sjis, MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE }; @@ -66,7 +70,7 @@ const mbfl_encoding mbfl_encoding_sjis_sb = { mbfl_no_encoding_sjis_sb, "SJIS-Mobile#SOFTBANK", "Shift_JIS", - NULL, + mbfl_encoding_sjis_sb_aliases, mblen_table_sjis, MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE }; diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index a5e2b0f2b4..db96ea3729 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -40,10 +40,10 @@ extern int mbfl_filt_ident_utf8(int c, mbfl_identify_filter *filter); extern const unsigned char mblen_table_utf8[]; -static const char *mbfl_encoding_utf8_docomo_aliases[] = {"utf8-mobile#docomo", NULL}; -static const char *mbfl_encoding_utf8_kddi_aliases[] = {"utf8-mobile#kddi", NULL}; -static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {"utf8-mobile#kddi-b", NULL}; -static const char *mbfl_encoding_utf8_sb_aliases[] = {"utf8-mobile#softbank", NULL}; +static const char *mbfl_encoding_utf8_docomo_aliases[] = {"UTF-8-DOCOMO", "UTF8-DOCOMO", NULL}; +static const char *mbfl_encoding_utf8_kddi_a_aliases[] = {"UTF-8-KDDI", "UTF8-KDDI", NULL}; +static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {"UTF-8-Mobile#KDDI", "UTF-8-KDDI", "UTF8-KDDI", NULL}; +static const char *mbfl_encoding_utf8_sb_aliases[] = {"UTF-8-SOFTBANK", "UTF8-SOFTBANK", NULL}; const mbfl_encoding mbfl_encoding_utf8_docomo = { mbfl_no_encoding_utf8_docomo, @@ -54,11 +54,11 @@ const mbfl_encoding mbfl_encoding_utf8_docomo = { MBFL_ENCTYPE_MBCS }; -const mbfl_encoding mbfl_encoding_utf8_kddi = { - mbfl_no_encoding_utf8_kddi, - "UTF-8-Mobile#KDDI", +const mbfl_encoding mbfl_encoding_utf8_kddi_a = { + mbfl_no_encoding_utf8_kddi_a, + "UTF-8-Mobile#KDDI-A", "UTF-8", - (const char *(*)[])&mbfl_encoding_utf8_kddi_aliases, + (const char *(*)[])&mbfl_encoding_utf8_kddi_a_aliases, mblen_table_utf8, MBFL_ENCTYPE_MBCS }; @@ -88,8 +88,8 @@ const struct mbfl_identify_vtbl vtbl_identify_utf8_docomo = { mbfl_filt_ident_utf8 }; -const struct mbfl_identify_vtbl vtbl_identify_utf8_kddi = { - mbfl_no_encoding_utf8_kddi, +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 @@ -127,8 +127,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_docomo = { mbfl_filt_conv_common_flush }; -const struct mbfl_convert_vtbl vtbl_utf8_kddi_wchar = { - mbfl_no_encoding_utf8_kddi, +const struct mbfl_convert_vtbl vtbl_utf8_kddi_a_wchar = { + mbfl_no_encoding_utf8_kddi_a, mbfl_no_encoding_wchar, mbfl_filt_conv_common_ctor, mbfl_filt_conv_common_dtor, @@ -136,9 +136,9 @@ const struct mbfl_convert_vtbl vtbl_utf8_kddi_wchar = { mbfl_filt_conv_common_flush }; -const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi = { +const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_a = { mbfl_no_encoding_wchar, - mbfl_no_encoding_utf8_kddi, + mbfl_no_encoding_utf8_kddi_a, mbfl_filt_conv_common_ctor, mbfl_filt_conv_common_dtor, mbfl_filt_conv_wchar_utf8_mobile, @@ -212,7 +212,7 @@ int mbfl_filt_conv_utf8_mobile_wchar(int c, mbfl_convert_filter *filter) if (filter->from->no_encoding == mbfl_no_encoding_utf8_docomo && mbfilter_conv_r_map_tbl(s, &s1, mbfl_docomo2uni_pua, 4) > 0) { s = mbfilter_sjis_emoji_docomo2unicode(s1, &snd); - } else if (filter->from->no_encoding == mbfl_no_encoding_utf8_kddi && + } else if (filter->from->no_encoding == mbfl_no_encoding_utf8_kddi_a && mbfilter_conv_r_map_tbl(s, &s1, mbfl_kddi2uni_pua, 6) > 0) { s = mbfilter_sjis_emoji_kddi2unicode(s1, &snd); } else if (filter->from->no_encoding == mbfl_no_encoding_utf8_kddi_b && @@ -320,7 +320,7 @@ int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter) if ((filter->to->no_encoding == mbfl_no_encoding_utf8_docomo && mbfilter_unicode2sjis_emoji_docomo(c, &s1, filter) > 0 && mbfilter_conv_map_tbl(s1, &c1, mbfl_docomo2uni_pua, 4) > 0) || - (filter->to->no_encoding == mbfl_no_encoding_utf8_kddi && + (filter->to->no_encoding == mbfl_no_encoding_utf8_kddi_a && mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter) > 0 && mbfilter_conv_map_tbl(s1, &c1, mbfl_kddi2uni_pua, 6) > 0) || (filter->to->no_encoding == mbfl_no_encoding_utf8_kddi_b && diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h index d8c411192b..ef5e6da7f9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h @@ -31,26 +31,24 @@ #define MBFL_MBFILTER_UTF8_MOBILE_H extern const mbfl_encoding mbfl_encoding_utf8_docomo; -extern const mbfl_encoding mbfl_encoding_utf8_kddi; +extern const mbfl_encoding mbfl_encoding_utf8_kddi_a; extern const mbfl_encoding mbfl_encoding_utf8_kddi_b; extern const mbfl_encoding mbfl_encoding_utf8_sb; extern const struct mbfl_identify_vtbl vtbl_identify_utf8_docomo; -extern const struct mbfl_identify_vtbl vtbl_identify_utf8_kddi; +extern const struct mbfl_identify_vtbl vtbl_identify_utf8_kddi_a; extern const struct mbfl_identify_vtbl vtbl_identify_utf8_kddi_b; extern const struct mbfl_identify_vtbl vtbl_identify_utf8_sb; extern const struct mbfl_convert_vtbl vtbl_utf8_docomo_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_utf8_docomo; -extern const struct mbfl_convert_vtbl vtbl_utf8_kddi_wchar; -extern const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi; +extern const struct mbfl_convert_vtbl vtbl_utf8_kddi_a_wchar; +extern const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_a; extern const struct mbfl_convert_vtbl vtbl_utf8_kddi_b_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_b; extern const struct mbfl_convert_vtbl vtbl_utf8_sb_wchar; extern const struct mbfl_convert_vtbl vtbl_wchar_utf8_sb; - - int mbfl_filt_conv_utf8_mobile_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter); diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 36c488af7a..ae8deb25fb 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -151,8 +151,8 @@ const struct mbfl_convert_vtbl *mbfl_convert_filter_list[] = { &vtbl_wchar_sjis_mac, &vtbl_utf8_docomo_wchar, &vtbl_wchar_utf8_docomo, - &vtbl_utf8_kddi_wchar, - &vtbl_wchar_utf8_kddi, + &vtbl_utf8_kddi_a_wchar, + &vtbl_wchar_utf8_kddi_a, &vtbl_utf8_kddi_b_wchar, &vtbl_wchar_utf8_kddi_b, &vtbl_utf8_sb_wchar, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index df63e8ae19..adf0c3ae87 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -171,7 +171,7 @@ static const mbfl_encoding *mbfl_encoding_ptr_list[] = { &mbfl_encoding_sjis_mac, &mbfl_encoding_sjis2004, &mbfl_encoding_utf8_docomo, - &mbfl_encoding_utf8_kddi, + &mbfl_encoding_utf8_kddi_a, &mbfl_encoding_utf8_kddi_b, &mbfl_encoding_utf8_sb, &mbfl_encoding_cp932, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h index 8cb752d422..ca7717cb7b 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h @@ -63,7 +63,7 @@ enum mbfl_no_encoding { mbfl_no_encoding_utf16le, mbfl_no_encoding_utf8, mbfl_no_encoding_utf8_docomo, - mbfl_no_encoding_utf8_kddi, + mbfl_no_encoding_utf8_kddi_a, mbfl_no_encoding_utf8_kddi_b, mbfl_no_encoding_utf8_sb, mbfl_no_encoding_utf7, diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c index e2594d5667..4d6283f4f2 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c @@ -129,7 +129,7 @@ static const struct mbfl_identify_vtbl *mbfl_identify_filter_list[] = { &vtbl_identify_sjis_kddi, &vtbl_identify_sjis_sb, &vtbl_identify_utf8_docomo, - &vtbl_identify_utf8_kddi, + &vtbl_identify_utf8_kddi_a, &vtbl_identify_utf8_kddi_b, &vtbl_identify_utf8_sb, &vtbl_identify_euccn,