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. --- stdio-common/vfscanf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'stdio-common') diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 3ca82cc4c7..feff0eb50a 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -86,7 +86,7 @@ # define ISXDIGIT(Ch) iswxdigit (Ch) # define TOLOWER(Ch) towlower (Ch) # define ORIENT if (s->_vtable_offset == 0 && _IO_fwide (s, 1) != 1)\ - return EOF + return WEOF # define __strtoll_internal __wcstoll_internal # define __strtoull_internal __wcstoull_internal # define __strtol_internal __wcstol_internal @@ -99,6 +99,8 @@ # define CHAR_T wchar_t # define UCHAR_T unsigned int # define WINT_T wint_t +# undef EOF +# define EOF WEOF # else # define ungetc(c, s) ((void) ((int) c == EOF \ || (--read_in, \ @@ -715,7 +717,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) if (!(flags & SUPPRESS)) { wstr = ARG (wchar_t *); - if (str == NULL) + if (wstr == NULL) conv_error (); } -- cgit v1.2.3-70-g09d2