diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-12-01 00:43:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-12-01 00:43:32 +0000 |
| commit | 411adb106872a8c52e26ca5f7049d5ec0a4a99dd (patch) | |
| tree | 0b4e68c6bb175004f36e80049cdd14e9680d8cf5 /stdio-common/vfscanf.c | |
| parent | 9a0fe6a8124692b9b09489f64717af94d1ffac13 (diff) | |
| download | glibc-411adb106872a8c52e26ca5f7049d5ec0a4a99dd.tar.gz | |
Update.
2000-11-29 H.J. Lu <hjl@gnu.org>
* stdio-common/vfscanf.c (ORIENT): Swap the COMPILE_WSCANF case.
2000-11-30 Jakub Jelinek <jakub@redhat.com>
* locale/setlocale.c (setname): Free for all categories, not just
LC_ALL.
(setlocale): Store a copy of string passed by user, not the string
itself.
* sysdeps/unix/sysv/linux/hppa/brk.c (__brk): Remove unused variable.
Diffstat (limited to 'stdio-common/vfscanf.c')
| -rw-r--r-- | stdio-common/vfscanf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index cf3befd399..2326801580 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -87,8 +87,7 @@ # define ISDIGIT(Ch) iswdigit (Ch) # define ISXDIGIT(Ch) iswxdigit (Ch) # define TOLOWER(Ch) towlower (Ch) -# define ORIENT if (s->_vtable_offset == 0 && _IO_fwide (s, 1) != 1)\ - return WEOF +# define ORIENT if (_IO_fwide (s, -1) != -1) return WEOF # define __strtoll_internal __wcstoll_internal # define __strtoull_internal __wcstoull_internal # define __strtol_internal __wcstol_internal @@ -117,7 +116,8 @@ # define ISDIGIT(Ch) isdigit (Ch) # define ISXDIGIT(Ch) isxdigit (Ch) # define TOLOWER(Ch) tolower (Ch) -# define ORIENT if (_IO_fwide (s, -1) != -1) return EOF +# define ORIENT if (s->_vtable_offset == 0 && _IO_fwide (s, 1) != 1)\ + return EOF # define L_(Str) Str # define CHAR_T char |