|
1 | 1 | /*
|
2 | 2 | * conversion functions between pg_wchar and multibyte streams.
|
3 | 3 | * Tatsuo Ishii
|
4 |
| - * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.60 2007/03/25 11:56:02 ishii Exp $ |
| 4 | + * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.61 2007/03/26 11:15:13 ishii Exp $ |
5 | 5 | *
|
6 | 6 | * WIN1250 client encoding updated by Pavel Behal
|
7 | 7 | *
|
@@ -1314,12 +1314,12 @@ pg_utf8_islegal(const unsigned char *source, int length)
|
1314 | 1314 | pg_wchar_tblpg_wchar_table[]= {
|
1315 | 1315 | {pg_ascii2wchar_with_len,pg_ascii_mblen,pg_ascii_dsplen,pg_ascii_verifier,1},/* 0; PG_SQL_ASCII*/
|
1316 | 1316 | {pg_eucjp2wchar_with_len,pg_eucjp_mblen,pg_eucjp_dsplen,pg_eucjp_verifier,3},/* 1; PG_EUC_JP */
|
1317 |
| -{pg_euccn2wchar_with_len,pg_euccn_mblen,pg_euccn_dsplen,pg_euccn_verifier,3},/* 2; PG_EUC_CN */ |
| 1317 | +{pg_euccn2wchar_with_len,pg_euccn_mblen,pg_euccn_dsplen,pg_euccn_verifier,2},/* 2; PG_EUC_CN */ |
1318 | 1318 | {pg_euckr2wchar_with_len,pg_euckr_mblen,pg_euckr_dsplen,pg_euckr_verifier,3},/* 3; PG_EUC_KR */
|
1319 |
| -{pg_euctw2wchar_with_len,pg_euctw_mblen,pg_euctw_dsplen,pg_euctw_verifier,3},/* 4; PG_EUC_TW */ |
| 1319 | +{pg_euctw2wchar_with_len,pg_euctw_mblen,pg_euctw_dsplen,pg_euctw_verifier,4},/* 4; PG_EUC_TW */ |
1320 | 1320 | {pg_johab2wchar_with_len,pg_johab_mblen,pg_johab_dsplen,pg_johab_verifier,3},/* 5; PG_JOHAB */
|
1321 | 1321 | {pg_utf2wchar_with_len,pg_utf_mblen,pg_utf_dsplen,pg_utf8_verifier,4},/* 6; PG_UTF8 */
|
1322 |
| -{pg_mule2wchar_with_len,pg_mule_mblen,pg_mule_dsplen,pg_mule_verifier,3},/* 7; PG_MULE_INTERNAL */ |
| 1322 | +{pg_mule2wchar_with_len,pg_mule_mblen,pg_mule_dsplen,pg_mule_verifier,4},/* 7; PG_MULE_INTERNAL */ |
1323 | 1323 | {pg_latin12wchar_with_len,pg_latin1_mblen,pg_latin1_dsplen,pg_latin1_verifier,1},/* 8; PG_LATIN1 */
|
1324 | 1324 | {pg_latin12wchar_with_len,pg_latin1_mblen,pg_latin1_dsplen,pg_latin1_verifier,1},/* 9; PG_LATIN2 */
|
1325 | 1325 | {pg_latin12wchar_with_len,pg_latin1_mblen,pg_latin1_dsplen,pg_latin1_verifier,1},/* 10; PG_LATIN3 */
|
@@ -1351,7 +1351,7 @@ pg_wchar_tbl pg_wchar_table[] = {
|
1351 | 1351 | {0,pg_big5_mblen,pg_big5_dsplen,pg_big5_verifier,2},/* 35; PG_BIG5 */
|
1352 | 1352 | {0,pg_gbk_mblen,pg_gbk_dsplen,pg_gbk_verifier,2},/* 36; PG_GBK */
|
1353 | 1353 | {0,pg_uhc_mblen,pg_uhc_dsplen,pg_uhc_verifier,2},/* 37; PG_UHC */
|
1354 |
| -{0,pg_gb18030_mblen,pg_gb18030_dsplen,pg_gb18030_verifier,2},/* 38; PG_GB18030 */ |
| 1354 | +{0,pg_gb18030_mblen,pg_gb18030_dsplen,pg_gb18030_verifier,4},/* 38; PG_GB18030 */ |
1355 | 1355 | {0,pg_sjis_mblen,pg_sjis_dsplen,pg_sjis_verifier,2}/* 39; PG_SHIFT_JIS_2004 */
|
1356 | 1356 | };
|
1357 | 1357 |
|
|