Skip to content

Commit c717c79

Browse files
committed
Combine CJK encoding conversion code in a single source file
This will make it easier to combine duplicated code between all the CJK text encodings (a significant amount is already combined in this commit, such as the repeated definitions of SJIS_DECODE and SJIS_ENCODE), but I hope to remove even more redundancy in the future. The table used to implement mb_strlen for CP932 has been changed to the same table as "SJIS-win".
1 parent 548e061 commit c717c79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+12667
-14854
lines changed

ext/mbstring/config.m4

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,30 +95,12 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
9595
libmbfl/filters/html_entities.c
9696
libmbfl/filters/mbfilter_7bit.c
9797
libmbfl/filters/mbfilter_base64.c
98-
libmbfl/filters/mbfilter_big5.c
99-
libmbfl/filters/mbfilter_cp5022x.c
100-
libmbfl/filters/mbfilter_cp51932.c
101-
libmbfl/filters/mbfilter_cp932.c
102-
libmbfl/filters/mbfilter_cp936.c
103-
libmbfl/filters/mbfilter_gb18030.c
104-
libmbfl/filters/mbfilter_euc_cn.c
105-
libmbfl/filters/mbfilter_euc_jp.c
106-
libmbfl/filters/mbfilter_euc_jp_win.c
107-
libmbfl/filters/mbfilter_euc_kr.c
108-
libmbfl/filters/mbfilter_euc_tw.c
98+
libmbfl/filters/mbfilter_cjk.c
10999
libmbfl/filters/mbfilter_htmlent.c
110-
libmbfl/filters/mbfilter_hz.c
111-
libmbfl/filters/mbfilter_iso2022_jp_ms.c
112-
libmbfl/filters/mbfilter_iso2022jp_mobile.c
113-
libmbfl/filters/mbfilter_iso2022_kr.c
114-
libmbfl/filters/mbfilter_jis.c
115100
libmbfl/filters/mbfilter_qprint.c
116101
libmbfl/filters/mbfilter_singlebyte.c
117-
libmbfl/filters/mbfilter_sjis.c
118-
libmbfl/filters/mbfilter_sjis_2004.c
119102
libmbfl/filters/mbfilter_ucs2.c
120103
libmbfl/filters/mbfilter_ucs4.c
121-
libmbfl/filters/mbfilter_uhc.c
122104
libmbfl/filters/mbfilter_utf16.c
123105
libmbfl/filters/mbfilter_utf32.c
124106
libmbfl/filters/mbfilter_utf7.c

ext/mbstring/config.w32

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ if (PHP_MBSTRING != "no") {
1717
"ext\\mbstring\\libmbfl\\config.h", true);
1818

1919
ADD_SOURCES("ext/mbstring/libmbfl/filters", "html_entities.c \
20-
mbfilter_7bit.c mbfilter_base64.c mbfilter_big5.c mbfilter_cp932.c \
21-
mbfilter_cp936.c mbfilter_cp51932.c mbfilter_euc_cn.c \
22-
mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \
23-
mbfilter_euc_tw.c mbfilter_htmlent.c mbfilter_hz.c mbfilter_iso2022_kr.c \
24-
mbfilter_jis.c mbfilter_iso2022_jp_ms.c mbfilter_gb18030.c \
25-
mbfilter_sjis_2004.c mbfilter_qprint.c mbfilter_sjis.c mbfilter_ucs2.c \
26-
mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c mbfilter_utf32.c \
20+
mbfilter_7bit.c mbfilter_base64.c \
21+
mbfilter_cjk.c mbfilter_htmlent.c \
22+
mbfilter_qprint.c mbfilter_ucs2.c \
23+
mbfilter_ucs4.c mbfilter_utf16.c mbfilter_utf32.c \
2724
mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c \
2825
mbfilter_utf8_mobile.c mbfilter_uuencode.c \
29-
mbfilter_cp5022x.c \
30-
mbfilter_iso2022jp_mobile.c mbfilter_singlebyte.c", "mbstring");
26+
mbfilter_singlebyte.c", "mbstring");
3127

3228
ADD_SOURCES("ext/mbstring/libmbfl/mbfl", "mbfilter.c mbfilter_8bit.c \
3329
mbfilter_pass.c mbfilter_wchar.c mbfl_convert.c mbfl_encoding.c \

0 commit comments

Comments
 (0)