diff options
| author | Andreas Jaeger <aj@suse.de> | 2001-01-02 17:02:20 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2001-01-02 17:02:20 +0000 |
| commit | 1dc72e4ffeddaad3982c8ea7978aba99f63867a4 (patch) | |
| tree | f4b6c9dd0999306c35276b24c4058d53db17ccd6 /libio | |
| parent | 78db65139d02ef0b0f88b48fdbe5249dc347690e (diff) | |
| download | glibc-1dc72e4ffeddaad3982c8ea7978aba99f63867a4.tar.gz glibc-1dc72e4ffeddaad3982c8ea7978aba99f63867a4.tar.xz glibc-1dc72e4ffeddaad3982c8ea7978aba99f63867a4.zip | |
Update.
* libio/wgenops.c (_IO_wdoallocbuf): Use correct wide access macro. (_IO_switch_to_wget_mode): Likewise. (_IO_sputbackwc): Likewise. (_IO_sungetwc): Use wint_t for result. * stdio-common/vfscanf.c (__vfscanf): Use WINT_T for done. * sysdeps/generic/strtol.c (strtol): Make cnt size_t for correct signedness. * sysdeps/generic/printf_fphex.c (putc): Cast _IO_putwc_unlocked to (int) to avoid warnings. * stdio-common/printf_fp.c (putc): Likewise. * stdio-common/printf_size.c (putc): Likewise.
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/wgenops.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libio/wgenops.c b/libio/wgenops.c index fa0aab36af..0e3b35d30e 100644 --- a/libio/wgenops.c +++ b/libio/wgenops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1993,1995,1997,1998,1999,2000,2001 Free Software Foundation, Inc. This file is part of the GNU IO Library. Written by Ulrich Drepper <drepper@cygnus.com>. Based on the single byte version by Per Bothner <bothner@cygnus.com>. @@ -403,7 +403,7 @@ _IO_wdoallocbuf (fp) if (fp->_wide_data->_IO_buf_base) return; if (!(fp->_flags & _IO_UNBUFFERED)) - if (_IO_DOALLOCATE (fp) != WEOF) + if ((wint_t)_IO_WDOALLOCATE (fp) != WEOF) return; _IO_wsetb (fp, fp->_wide_data->_shortbuf, fp->_wide_data->_shortbuf + 1, 0); } @@ -453,7 +453,7 @@ _IO_switch_to_wget_mode (fp) _IO_FILE *fp; { if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_write_base) - if (_IO_OVERFLOW (fp, WEOF) == WEOF) + if ((wint_t)_IO_WOVERFLOW (fp, WEOF) == WEOF) return EOF; if (_IO_in_backup (fp)) fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_backup_base; @@ -622,7 +622,7 @@ _IO_sputbackwc (fp, c) else result = _IO_PBACKFAIL (fp, c); - if (result != EOF) + if (result != WEOF) fp->_flags &= ~_IO_EOF_SEEN; return result; @@ -632,7 +632,7 @@ wint_t _IO_sungetwc (fp) _IO_FILE *fp; { - int result; + wint_t result; if (fp->_wide_data->_IO_read_ptr > fp->_wide_data->_IO_read_base) { |