aboutsummaryrefslogtreecommitdiff
path: root/localedata/tests-mbwc/dat_wctob.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-28 04:27:24 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-28 04:27:24 +0000
commit0e16ecfa1e7689c0b3be626f9a3441ebb5710c70 (patch)
tree12a793be9d9a1f7a4a911239194bae33470dcb23 /localedata/tests-mbwc/dat_wctob.c
parent37696206076f6f075542adfdc4b1fe49100e9f32 (diff)
downloadglibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.zip
glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.tar.gz
glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.tar.bz2
Update.
* locale/programs/ld-ctype.c (ctype_finish): Take all characters from the input charset into account when generating the hash table. (allocate_arrays): Correct setting default width. Not all empty slots in the table are filled, only those not covert explicitly by the locale description and in the charset. * stdio-common/vfscanf.c: Make sure to always return WEOF and EOF for wide character version. For %C handling, test correct pointer variable for NULL. * wcsmbs/wctob.c: Handle WEOF special. * wcsmbs/wcwidth.h: 0xff in width array means invalid character. * wctype/wctype.h: Protect gcc-isms with __extension__. Avoid always-true test to avoid warning.
Diffstat (limited to 'localedata/tests-mbwc/dat_wctob.c')
-rw-r--r--localedata/tests-mbwc/dat_wctob.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/localedata/tests-mbwc/dat_wctob.c b/localedata/tests-mbwc/dat_wctob.c
index 9f30aff..d40b74a 100644
--- a/localedata/tests-mbwc/dat_wctob.c
+++ b/localedata/tests-mbwc/dat_wctob.c
@@ -25,8 +25,14 @@ TST_WCTOB tst_wctob_loc [] = {
{ { WEOF }, { 0,0, 1, EOF } },
{ { 0x0020 }, { 0,0, 1, 0x20 } },
{ { 0x0061 }, { 0,0, 1, 0x61 } },
+#ifdef SHOJI_IS_RIGHT
{ { 0x0080 }, { 0,0, 1, 0x80 } },
{ { 0x00C4 }, { 0,0, 1, 0xC4 } },
+#else
+ /* XXX These are no valid characters. */
+ { { 0x0080 }, { 0,0, 1, EOF } },
+ { { 0x00C4 }, { 0,0, 1, EOF } },
+#endif
{ { 0x30C4 }, { 0,0, 1, EOF } },
{ is_last: 1 } /* Last element. */
}
@@ -36,7 +42,12 @@ TST_WCTOB tst_wctob_loc [] = {
{ { WEOF }, { 0,0, 1, EOF } },
{ { 0x0020 }, { 0,0, 1, 0x20 } },
{ { 0x0061 }, { 0,0, 1, 0x61 } },
+#ifdef SHOJI_IS_RIGHT
{ { 0x0080 }, { 0,0, 1, 0x80 } }, /* <WAIVER> */
+#else
+ /* XXX These are no valid characters. */
+ { { 0x0080 }, { 0,0, 1, EOF } },
+#endif
{ { 0x00C4 }, { 0,0, 1, EOF } },
{ { 0x30C4 }, { 0,0, 1, EOF } },
{ is_last: 1 } /* Last element. */