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.

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c
index f2cc65b4ae34d0110b896ad47765185ed8977a29..45a2049c03788ee8608b668aed49b30f40c4ef3b 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
index c2e2f997b8c49945cfbf9b146b6081886577adce..4b63602916de20e172abaf97b470e74762e1f0ae 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
index eb80216ddbae87cb23429da32c10e7f60cd3397e..f61ac6f5a88eb6bb55fedc4388c927ed7466176a 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.c b/ext/mbstring/libmbfl/filters/mbfilter_hz.c
index 217b890e9d14c56948bd63e2a062562cf38bc501..93de2bffebe6651debf80c9a957639e17ea5898e 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_hz.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
index 98c1da635776e3a91ce8e7ba3d13aded747b0c07..69c95d57f3b7bb41e5c4b0ba72238d8a9b0099db 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
index af60eb9d65616a81847fd14ecda1b8a89ae12e89..1ed8940e753452721817b069ded833e119e4da4d 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
index 42224f48853496a7d5f404e8af3a7b22b90bcb75..85520c2af89c01d7a932abf6006d9b3535af3f04 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
index 73cb91cb05c23cb87a520cdecca7f7a8f10a596b..2fe7379d01cff01d238f479e39122f64d629d89b 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c
index b100d32abac4a7adf5ff9f8f4baaf293c64c5886..84656e64daa7a1306884fb4ca78e4df1adba5bc4 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c
index a7438e6e6991e4de2ac61ad2b2c417746a43c5f1..b03e4921d91f7673683f829d093a0f023a71a5d9 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c
index bc05adcb79fc29e211037f617bdabd4480fb74b9..2318a195840ba4c54d2817906836f8d41a5cf193 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c
index 60097b4137bbc18e532f08ee96b3f2ae6794a0ff..7b346236bb5b09253aaf26f51f20423281b43da8 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c
@@ -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
 };

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_consts.h b/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
index cad99b0a6637fc9c263184c6faab17641a00b168..3e154008794662265f213b258b1014263576b703 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
@@ -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 */