From 0e16ecfa1e7689c0b3be626f9a3441ebb5710c70 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 28 Jun 2000 04:27:24 +0000 Subject: 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. --- localedata/tests-mbwc/tst_wcsstr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'localedata/tests-mbwc/tst_wcsstr.c') diff --git a/localedata/tests-mbwc/tst_wcsstr.c b/localedata/tests-mbwc/tst_wcsstr.c index 02f756c37c..15654df0a9 100644 --- a/localedata/tests-mbwc/tst_wcsstr.c +++ b/localedata/tests-mbwc/tst_wcsstr.c @@ -31,7 +31,7 @@ tst_wcsstr (FILE * fp, int debug_flg) if (ret) { fprintf (stderr, - " ret[ 0 ] = 0x%x <-> 0x%x = ws2[ 0 ]\n", + " ret[ 0 ] = 0x%lx <-> 0x%lx = ws2[ 0 ]\n", ret[0], ws2[0]); } } @@ -59,8 +59,8 @@ tst_wcsstr (FILE * fp, int debug_flg) if (debug_flg) { fprintf (stderr, - " : ret[ %d ] = 0x%x <-> 0x%x = ws2[ %d ]\n", i, - ret[i], ws2[i], i); + " : ret[ %d ] = 0x%lx <-> 0x%lx = ws2[ %d ]\n", + i, ret[i], ws2[i], i); } if (ret[i] != ws2[i]) -- cgit 1.4.1