Skip to content

Commit e169ad3

Browse files
committed
Consolidate all single-byte encodings in one source file
We can squeeze out a lot of duplicated code in this way.
1 parent 17d82b6 commit e169ad3

File tree

75 files changed

+639
-4235
lines changed

Some content is hidden

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

75 files changed

+639
-4235
lines changed

ext/mbstring/config.m4

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,10 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
9494
PHP_MBSTRING_ADD_SOURCES([
9595
libmbfl/filters/html_entities.c
9696
libmbfl/filters/mbfilter_7bit.c
97-
libmbfl/filters/mbfilter_ascii.c
9897
libmbfl/filters/mbfilter_base64.c
9998
libmbfl/filters/mbfilter_big5.c
100-
libmbfl/filters/mbfilter_cp1251.c
101-
libmbfl/filters/mbfilter_cp1252.c
102-
libmbfl/filters/mbfilter_cp1254.c
10399
libmbfl/filters/mbfilter_cp5022x.c
104100
libmbfl/filters/mbfilter_cp51932.c
105-
libmbfl/filters/mbfilter_cp850.c
106-
libmbfl/filters/mbfilter_cp866.c
107101
libmbfl/filters/mbfilter_cp932.c
108102
libmbfl/filters/mbfilter_cp936.c
109103
libmbfl/filters/mbfilter_gb18030.c
@@ -119,24 +113,9 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
119113
libmbfl/filters/mbfilter_iso2022jp_2004.c
120114
libmbfl/filters/mbfilter_iso2022jp_mobile.c
121115
libmbfl/filters/mbfilter_iso2022_kr.c
122-
libmbfl/filters/mbfilter_iso8859_1.c
123-
libmbfl/filters/mbfilter_iso8859_10.c
124-
libmbfl/filters/mbfilter_iso8859_13.c
125-
libmbfl/filters/mbfilter_iso8859_14.c
126-
libmbfl/filters/mbfilter_iso8859_15.c
127-
libmbfl/filters/mbfilter_iso8859_16.c
128-
libmbfl/filters/mbfilter_iso8859_2.c
129-
libmbfl/filters/mbfilter_iso8859_3.c
130-
libmbfl/filters/mbfilter_iso8859_4.c
131-
libmbfl/filters/mbfilter_iso8859_5.c
132-
libmbfl/filters/mbfilter_iso8859_6.c
133-
libmbfl/filters/mbfilter_iso8859_7.c
134-
libmbfl/filters/mbfilter_iso8859_8.c
135-
libmbfl/filters/mbfilter_iso8859_9.c
136116
libmbfl/filters/mbfilter_jis.c
137-
libmbfl/filters/mbfilter_koi8r.c
138-
libmbfl/filters/mbfilter_armscii8.c
139117
libmbfl/filters/mbfilter_qprint.c
118+
libmbfl/filters/mbfilter_singlebyte.c
140119
libmbfl/filters/mbfilter_sjis.c
141120
libmbfl/filters/mbfilter_sjis_open.c
142121
libmbfl/filters/mbfilter_sjis_mobile.c
@@ -153,7 +132,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
153132
libmbfl/filters/mbfilter_utf8.c
154133
libmbfl/filters/mbfilter_utf8_mobile.c
155134
libmbfl/filters/mbfilter_uuencode.c
156-
libmbfl/filters/mbfilter_koi8u.c
157135
libmbfl/mbfl/mbfilter.c
158136
libmbfl/mbfl/mbfilter_8bit.c
159137
libmbfl/mbfl/mbfilter_pass.c

ext/mbstring/config.w32

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,18 @@ 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_ascii.c mbfilter_base64.c mbfilter_big5.c \
21-
mbfilter_cp1251.c mbfilter_cp1252.c \
22-
mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_cp51932.c \
23-
mbfilter_euc_cn.c mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.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 \
2423
mbfilter_euc_tw.c mbfilter_htmlent.c mbfilter_hz.c mbfilter_iso2022_kr.c \
25-
mbfilter_iso8859_1.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c \
26-
mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c \
27-
mbfilter_iso8859_2.c mbfilter_iso8859_3.c mbfilter_iso8859_4.c \
28-
mbfilter_iso8859_5.c mbfilter_iso8859_6.c mbfilter_iso8859_7.c \
29-
mbfilter_iso8859_8.c mbfilter_iso8859_9.c mbfilter_jis.c \
30-
mbfilter_iso2022_jp_ms.c mbfilter_gb18030.c mbfilter_sjis_2004.c \
31-
mbfilter_koi8r.c mbfilter_qprint.c mbfilter_sjis.c mbfilter_ucs2.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 \
3226
mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c mbfilter_utf32.c \
33-
mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c mbfilter_utf8_mobile.c \
34-
mbfilter_koi8u.c mbfilter_cp1254.c mbfilter_euc_jp_2004.c \
35-
mbfilter_uuencode.c mbfilter_armscii8.c mbfilter_cp850.c \
27+
mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c \
28+
mbfilter_utf8_mobile.c mbfilter_euc_jp_2004.c mbfilter_uuencode.c \
3629
mbfilter_cp5022x.c mbfilter_sjis_open.c mbfilter_sjis_mobile.c \
37-
mbfilter_sjis_mac.c \
38-
mbfilter_iso2022jp_2004.c mbfilter_iso2022jp_mobile.c \
30+
mbfilter_sjis_mac.c mbfilter_iso2022jp_2004.c \
31+
mbfilter_iso2022jp_mobile.c mbfilter_singlebyte.c \
3932
mbfilter_tl_jisx0201_jisx0208.c", "mbstring");
4033

4134
ADD_SOURCES("ext/mbstring/libmbfl/mbfl", "mbfilter.c mbfilter_8bit.c \

ext/mbstring/libmbfl/filters/mbfilter_armscii8.c

Lines changed: 0 additions & 102 deletions
This file was deleted.

ext/mbstring/libmbfl/filters/mbfilter_armscii8.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

ext/mbstring/libmbfl/filters/mbfilter_ascii.c

Lines changed: 0 additions & 95 deletions
This file was deleted.

ext/mbstring/libmbfl/filters/mbfilter_ascii.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)