Skip to content

Commit cdc6640

Browse files
alexdowadalexdowad
committed
Comment constants in mbfl_consts.h, remove unused ones
These were unused, and almost certainly will never be used: - MBFL_ENCTYPE_MWC4BE - MBFL_ENCTYPE_MWC4LE - MBFL_ENCTYPE_SHFTCODE - MBFL_ENCTYPE_ENC_STRM For the latter two, there were some encodings which were marked with these flags; but nothing ever _checked_ these particular flags.
1 parent 3a100cd commit cdc6640

13 files changed

+25
-29
lines changed

‎ext/mbstring/libmbfl/filters/mbfilter_base64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const mbfl_encoding mbfl_encoding_base64 = {
3737
"BASE64",
3838
NULL,
3939
NULL,
40-
MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE,
40+
MBFL_ENCTYPE_GL_UNSAFE,
4141
NULL,
4242
NULL
4343
};

‎ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const mbfl_encoding mbfl_encoding_jis_ms = {
5050
"ISO-2022-JP",
5151
NULL,
5252
NULL,
53-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
53+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
5454
&vtbl_jis_ms_wchar,
5555
&vtbl_wchar_jis_ms
5656
};
@@ -61,7 +61,7 @@ const mbfl_encoding mbfl_encoding_cp50220 = {
6161
"ISO-2022-JP",
6262
(const char *(*)[])NULL,
6363
NULL,
64-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
64+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
6565
&vtbl_cp50220_wchar,
6666
&vtbl_wchar_cp50220
6767
};
@@ -72,7 +72,7 @@ const mbfl_encoding mbfl_encoding_cp50220raw = {
7272
"ISO-2022-JP",
7373
(const char *(*)[])NULL,
7474
NULL,
75-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
75+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
7676
&vtbl_cp50220raw_wchar,
7777
&vtbl_wchar_cp50220raw
7878
};
@@ -83,7 +83,7 @@ const mbfl_encoding mbfl_encoding_cp50221 = {
8383
"ISO-2022-JP",
8484
NULL,
8585
NULL,
86-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
86+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
8787
&vtbl_cp50221_wchar,
8888
&vtbl_wchar_cp50221
8989
};
@@ -94,7 +94,7 @@ const mbfl_encoding mbfl_encoding_cp50222 = {
9494
"ISO-2022-JP",
9595
NULL,
9696
NULL,
97-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
97+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
9898
&vtbl_cp50222_wchar,
9999
&vtbl_wchar_cp50222
100100
};

‎ext/mbstring/libmbfl/filters/mbfilter_htmlent.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const mbfl_encoding mbfl_encoding_html_ent = {
5959
"HTML-ENTITIES",
6060
(const char *(*)[])&mbfl_encoding_html_ent_aliases,
6161
NULL,
62-
MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE,
62+
MBFL_ENCTYPE_GL_UNSAFE,
6363
&vtbl_html_wchar,
6464
&vtbl_wchar_html
6565
};

‎ext/mbstring/libmbfl/filters/mbfilter_hz.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const mbfl_encoding mbfl_encoding_hz = {
4040
"HZ-GB-2312",
4141
NULL,
4242
NULL,
43-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
43+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
4444
&vtbl_hz_wchar,
4545
&vtbl_wchar_hz
4646
};

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const mbfl_encoding mbfl_encoding_2022jpms = {
4444
"ISO-2022-JP",
4545
(const char *(*)[])&mbfl_encoding_2022jpms_aliases,
4646
NULL,
47-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
47+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
4848
&vtbl_2022jpms_wchar,
4949
&vtbl_wchar_2022jpms
5050
};

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const mbfl_encoding mbfl_encoding_2022kr = {
3939
"ISO-2022-KR",
4040
NULL,
4141
NULL,
42-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
42+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
4343
&vtbl_2022kr_wchar,
4444
&vtbl_wchar_2022kr
4545
};

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const mbfl_encoding mbfl_encoding_2022jp_2004 = {
4242
"ISO-2022-JP-2004",
4343
NULL,
4444
NULL,
45-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
45+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
4646
&vtbl_2022jp_2004_wchar,
4747
&vtbl_wchar_2022jp_2004
4848
};

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const mbfl_encoding mbfl_encoding_2022jp_kddi = {
4646
"ISO-2022-JP",
4747
(const char *(*)[])&mbfl_encoding_2022jp_kddi_aliases,
4848
NULL,
49-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
49+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
5050
&vtbl_2022jp_kddi_wchar,
5151
&vtbl_wchar_2022jp_kddi
5252
};

‎ext/mbstring/libmbfl/filters/mbfilter_jis.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const mbfl_encoding mbfl_encoding_jis = {
4242
"ISO-2022-JP",
4343
NULL,
4444
NULL,
45-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
45+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
4646
&vtbl_jis_wchar,
4747
&vtbl_wchar_jis
4848
};
@@ -53,7 +53,7 @@ const mbfl_encoding mbfl_encoding_2022jp = {
5353
"ISO-2022-JP",
5454
NULL,
5555
NULL,
56-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
56+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
5757
&vtbl_2022jp_wchar,
5858
&vtbl_wchar_2022jp
5959
};

‎ext/mbstring/libmbfl/filters/mbfilter_qprint.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const mbfl_encoding mbfl_encoding_qprint = {
3939
"Quoted-Printable",
4040
(const char *(*)[])&mbfl_encoding_qprint_aliases,
4141
NULL,
42-
MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE,
42+
MBFL_ENCTYPE_GL_UNSAFE,
4343
NULL,
4444
NULL
4545
};

‎ext/mbstring/libmbfl/filters/mbfilter_utf7.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const mbfl_encoding mbfl_encoding_utf7 = {
5353
"UTF-7",
5454
(const char *(*)[])&mbfl_encoding_utf7_aliases,
5555
NULL,
56-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
56+
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
5757
&vtbl_utf7_wchar,
5858
&vtbl_wchar_utf7
5959
};

‎ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const mbfl_encoding mbfl_encoding_utf7imap = {
3636
NULL,
3737
NULL,
3838
NULL,
39-
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE,
39+
MBFL_ENCTYPE_MBCS,
4040
&vtbl_utf7imap_wchar,
4141
&vtbl_wchar_utf7imap
4242
};

‎ext/mbstring/libmbfl/mbfl/mbfl_consts.h

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,14 @@
3131
#ifndef MBFL_CONSTS_H
3232
#define MBFL_CONSTS_H
3333

34-
#define MBFL_ENCTYPE_SBCS 0x00000001
35-
#define MBFL_ENCTYPE_MBCS 0x00000002
36-
#define MBFL_ENCTYPE_WCS2BE 0x00000010
37-
#define MBFL_ENCTYPE_WCS2LE 0x00000020
38-
#define MBFL_ENCTYPE_MWC2BE 0x00000040
39-
#define MBFL_ENCTYPE_MWC2LE 0x00000080
40-
#define MBFL_ENCTYPE_WCS4BE 0x00000100
41-
#define MBFL_ENCTYPE_WCS4LE 0x00000200
42-
#define MBFL_ENCTYPE_MWC4BE 0x00000400
43-
#define MBFL_ENCTYPE_MWC4LE 0x00000800
44-
#define MBFL_ENCTYPE_SHFTCODE 0x00001000
45-
#define MBFL_ENCTYPE_ENC_STRM 0x00002000
34+
#define MBFL_ENCTYPE_SBCS 0x00000001 /* single-byte encoding */
35+
#define MBFL_ENCTYPE_MBCS 0x00000002 /* multi-byte encoding */
36+
#define MBFL_ENCTYPE_WCS2BE 0x00000010 /* 2 bytes/char, big endian */
37+
#define MBFL_ENCTYPE_WCS2LE 0x00000020 /* 2 bytes/char, little endian */
38+
#define MBFL_ENCTYPE_MWC2BE 0x00000040 /* 2+ bytes/char, big endian */
39+
#define MBFL_ENCTYPE_MWC2LE 0x00000080 /* 2+ bytes/char, little endian */
40+
#define MBFL_ENCTYPE_WCS4BE 0x00000100 /* 4 bytes/char, big endian */
41+
#define MBFL_ENCTYPE_WCS4LE 0x00000200 /* 4 bytes/char, little endian */
4642
#define MBFL_ENCTYPE_GL_UNSAFE 0x00004000
4743

4844
/* wchar plane, special character */

0 commit comments

Comments
 (0)