clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment constants in mbfl_consts.h, remove unused ones

Browse Source 
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.
This commit is contained in:
Alex Dowad 2020-07-11 18:21:17 +02:00
parent 3a100cd7ac
commit cdc664049c
13 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mbstring/libmbfl/filters/mbfilter_base64.c
View File

@ -37,7 +37,7 @@ const mbfl_encoding mbfl_encoding_base64 = {
"BASE64",
NULL,
NULL,
MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_GL_UNSAFE,
NULL,
NULL
};

10
ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
View File

@ -50,7 +50,7 @@ const mbfl_encoding mbfl_encoding_jis_ms = {
"ISO-2022-JP",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_jis_ms_wchar,
&vtbl_wchar_jis_ms
};
@ -61,7 +61,7 @@ const mbfl_encoding mbfl_encoding_cp50220 = {
"ISO-2022-JP",
(const char *(*)[])NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_cp50220_wchar,
&vtbl_wchar_cp50220
};
@ -72,7 +72,7 @@ const mbfl_encoding mbfl_encoding_cp50220raw = {
"ISO-2022-JP",
(const char *(*)[])NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_cp50220raw_wchar,
&vtbl_wchar_cp50220raw
};
@ -83,7 +83,7 @@ const mbfl_encoding mbfl_encoding_cp50221 = {
"ISO-2022-JP",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_cp50221_wchar,
&vtbl_wchar_cp50221
};
@ -94,7 +94,7 @@ const mbfl_encoding mbfl_encoding_cp50222 = {
"ISO-2022-JP",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_cp50222_wchar,
&vtbl_wchar_cp50222
};

2
ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
View File

@ -59,7 +59,7 @@ const mbfl_encoding mbfl_encoding_html_ent = {
"HTML-ENTITIES",
(const char *(*)[])&mbfl_encoding_html_ent_aliases,
NULL,
MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_html_wchar,
&vtbl_wchar_html
};

2
ext/mbstring/libmbfl/filters/mbfilter_hz.c
View File

@ -40,7 +40,7 @@ const mbfl_encoding mbfl_encoding_hz = {
"HZ-GB-2312",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_hz_wchar,
&vtbl_wchar_hz
};

2
ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
View File

@ -44,7 +44,7 @@ const mbfl_encoding mbfl_encoding_2022jpms = {
"ISO-2022-JP",
(const char *(*)[])&mbfl_encoding_2022jpms_aliases,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_2022jpms_wchar,
&vtbl_wchar_2022jpms
};

2
ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
View File

@ -39,7 +39,7 @@ const mbfl_encoding mbfl_encoding_2022kr = {
"ISO-2022-KR",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_2022kr_wchar,
&vtbl_wchar_2022kr
};

2
ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
View File

@ -42,7 +42,7 @@ const mbfl_encoding mbfl_encoding_2022jp_2004 = {
"ISO-2022-JP-2004",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_2022jp_2004_wchar,
&vtbl_wchar_2022jp_2004
};

2
ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
View File

@ -46,7 +46,7 @@ const mbfl_encoding mbfl_encoding_2022jp_kddi = {
"ISO-2022-JP",
(const char *(*)[])&mbfl_encoding_2022jp_kddi_aliases,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_2022jp_kddi_wchar,
&vtbl_wchar_2022jp_kddi
};

4
ext/mbstring/libmbfl/filters/mbfilter_jis.c
View File

@ -42,7 +42,7 @@ const mbfl_encoding mbfl_encoding_jis = {
"ISO-2022-JP",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_jis_wchar,
&vtbl_wchar_jis
};
@ -53,7 +53,7 @@ const mbfl_encoding mbfl_encoding_2022jp = {
"ISO-2022-JP",
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_2022jp_wchar,
&vtbl_wchar_2022jp
};

2
ext/mbstring/libmbfl/filters/mbfilter_qprint.c
View File

@ -39,7 +39,7 @@ const mbfl_encoding mbfl_encoding_qprint = {
"Quoted-Printable",
(const char *(*)[])&mbfl_encoding_qprint_aliases,
NULL,
MBFL_ENCTYPE_ENC_STRM | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_GL_UNSAFE,
NULL,
NULL
};

2
ext/mbstring/libmbfl/filters/mbfilter_utf7.c
View File

@ -53,7 +53,7 @@ const mbfl_encoding mbfl_encoding_utf7 = {
"UTF-7",
(const char *(*)[])&mbfl_encoding_utf7_aliases,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE,
&vtbl_utf7_wchar,
&vtbl_wchar_utf7
};

2
ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c
View File

@ -36,7 +36,7 @@ const mbfl_encoding mbfl_encoding_utf7imap = {
NULL,
NULL,
NULL,
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE,
MBFL_ENCTYPE_MBCS,
&vtbl_utf7imap_wchar,
&vtbl_wchar_utf7imap
};

20
ext/mbstring/libmbfl/mbfl/mbfl_consts.h
View File

@ -31,18 +31,14 @@
#ifndef MBFL_CONSTS_H
#define MBFL_CONSTS_H
#define MBFL_ENCTYPE_SBCS 0x00000001
#define MBFL_ENCTYPE_MBCS 0x00000002
#define MBFL_ENCTYPE_WCS2BE 0x00000010
#define MBFL_ENCTYPE_WCS2LE 0x00000020
#define MBFL_ENCTYPE_MWC2BE 0x00000040
#define MBFL_ENCTYPE_MWC2LE 0x00000080
#define MBFL_ENCTYPE_WCS4BE 0x00000100
#define MBFL_ENCTYPE_WCS4LE 0x00000200
#define MBFL_ENCTYPE_MWC4BE 0x00000400
#define MBFL_ENCTYPE_MWC4LE 0x00000800
#define MBFL_ENCTYPE_SHFTCODE 0x00001000
#define MBFL_ENCTYPE_ENC_STRM 0x00002000
#define MBFL_ENCTYPE_SBCS 0x00000001 /* single-byte encoding */
#define MBFL_ENCTYPE_MBCS 0x00000002 /* multi-byte encoding */
#define MBFL_ENCTYPE_WCS2BE 0x00000010 /* 2 bytes/char, big endian */
#define MBFL_ENCTYPE_WCS2LE 0x00000020 /* 2 bytes/char, little endian */
#define MBFL_ENCTYPE_MWC2BE 0x00000040 /* 2+ bytes/char, big endian */
#define MBFL_ENCTYPE_MWC2LE 0x00000080 /* 2+ bytes/char, little endian */
#define MBFL_ENCTYPE_WCS4BE 0x00000100 /* 4 bytes/char, big endian */
#define MBFL_ENCTYPE_WCS4LE 0x00000200 /* 4 bytes/char, little endian */
#define MBFL_ENCTYPE_GL_UNSAFE 0x00004000
/* wchar plane, special character */