Skip to content

Commit

Permalink
Regenerate cp map
Browse files Browse the repository at this point in the history
Add missing encoding name and don't put nameless cp
  • Loading branch information
weltling committed Nov 15, 2017
1 parent 4615fcf commit c94d091
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions win32/cp_enc_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ static const struct php_win32_cp php_win32_cp_map[] = { { 37, 0, 0, 1, "IBM037",
{ 20932, 0, 0, 2, "EUC-JP", "EUC-JP|EUCJP|EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE|CSEUCPKDFMTJAPANESE", "20932 (JIS X 0208-1990 & 0212-1990)" },
{ 20936, 0, 0, 2, "x-cp20936", NULL, "20936 (Simplified Chinese GB2312)" },
{ 21025, 0, 0, 1, "cp1025", NULL, "21025 (IBM EBCDIC - Cyrillic (Serbian, Bulgarian))" },
{ 21027, 0, 0, 1, "", NULL, "21027 (Ext Alpha Lowercase)" },
{ 21866, 0, 0, 1, "koi8-u", "KOI8-U", "21866 (Ukrainian - KOI8-U)" },
{ 28591, 0, 0, 1, "iso-8859-1", "CP819|IBM819|ISO-8859-1|ISO-IR-100|ISO8859-1|ISO_8859-1|ISO_8859-1:1987|L1|LATIN1|CSISOLATIN1", "28591 (ISO 8859-1 Latin I)" },
{ 28592, 0, 0, 1, "iso-8859-2", "ISO-8859-2|ISO-IR-101|ISO8859-2|ISO_8859-2|ISO_8859-2:1987|L2|LATIN2|CSISOLATIN2", "28592 (ISO 8859-2 Central Europe)" },
Expand All @@ -126,7 +125,7 @@ static const struct php_win32_cp php_win32_cp_map[] = { { 37, 0, 0, 1, "IBM037",
{ 50222, 0, 0, 5, "iso-2022-jp", "ISO-2022-JP|CP50222", "50222 (ISO-2022 Japanese JIS X 0201-1989)" },
{ 50225, 0, 0, 5, "iso-2022-kr", "ISO-2022-KR|CSISO2022KR", "50225 (ISO-2022 Korean)" },
{ 50227, 0, 0, 5, "x-cp50227", NULL, "50227 (ISO-2022 Simplified Chinese)" },
{ 50229, 0, 0, 5, "", NULL, "50229 (ISO-2022 Traditional Chinese)" },
{ 50229, 0, 0, 5, "x-cp50229", NULL, "50229 (ISO-2022 Traditional Chinese)" },
/* 50930 is invalid */
/* 50931 is invalid */
/* 50933 is invalid */
Expand Down
4 changes: 2 additions & 2 deletions win32/cp_enc_map_gen.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static const struct cp cp_map[] = {
{ 20936, "x-cp20936", "", "Simplified Chinese (GB2312); Chinese Simplified (GB2312-80)" },
{ 20949, "x-cp20949", "", "Korean Wansung" },
{ 21025, "cp1025", "", "IBM EBCDIC Cyrillic Serbian-Bulgarian" },
{ 21027, "", "", "(deprecated)" },
/*{ 21027, "", "", "(deprecated)" },*/
{ 21866, "koi8-u", "KOI8-U", "Ukrainian (KOI8-U); Cyrillic (KOI8-U)" },
{ 28591, "iso-8859-1", "CP819|IBM819|ISO-8859-1|ISO-IR-100|ISO8859-1|ISO_8859-1|ISO_8859-1:1987|L1|LATIN1|CSISOLATIN1", "ISO 8859-1 Latin 1; Western European (ISO)" },
{ 28592, "iso-8859-2", "ISO-8859-2|ISO-IR-101|ISO8859-2|ISO_8859-2|ISO_8859-2:1987|L2|LATIN2|CSISOLATIN2", "ISO 8859-2 Central European; Central European (ISO)" },
Expand All @@ -137,7 +137,7 @@ static const struct cp cp_map[] = {
{ 50222, "iso-2022-jp", "ISO-2022-JP|CP50222", "ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI)" },
{ 50225, "iso-2022-kr", "ISO-2022-KR|CSISO2022KR", "ISO 2022 Korean" },
{ 50227, "x-cp50227", "", "ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022)" },
{ 50229, "", "", "ISO 2022 Traditional Chinese" },
{ 50229, "x-cp50229", "", "ISO 2022 Traditional Chinese" },
{ 50930, "", "", "EBCDIC Japanese (Katakana) Extended" },
{ 50931, "", "", "EBCDIC US-Canada and Japanese" },
{ 50933, "", "", "EBCDIC Korean Extended and Korean" },
Expand Down

0 comments on commit c94d091

Please sign in to comment.