aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-01-02 17:02:20 +0000
committerAndreas Jaeger <aj@suse.de>2001-01-02 17:02:20 +0000
commit1dc72e4ffeddaad3982c8ea7978aba99f63867a4 (patch)
treef4b6c9dd0999306c35276b24c4058d53db17ccd6 /stdio-common
parent78db65139d02ef0b0f88b48fdbe5249dc347690e (diff)
downloadglibc-1dc72e4ffeddaad3982c8ea7978aba99f63867a4.tar
glibc-1dc72e4ffeddaad3982c8ea7978aba99f63867a4.tar.gz
glibc-1dc72e4ffeddaad3982c8ea7978aba99f63867a4.tar.bz2
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 'stdio-common')
-rw-r--r--stdio-common/printf_fp.c4
-rw-r--r--stdio-common/printf_size.c4
-rw-r--r--stdio-common/vfscanf.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index dc5f47dc99..f2c793fc22 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -1,5 +1,5 @@
/* Floating point output for `printf'.
- Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -57,7 +57,7 @@
names equal. */
# undef putc
# define putc(c, f) (wide \
- ? _IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
+ ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
# define size_t _IO_size_t
# define FILE _IO_FILE
#else /* ! USE_IN_LIBIO */
diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c
index c3da4dcb17..1eaccdf027 100644
--- a/stdio-common/printf_size.c
+++ b/stdio-common/printf_size.c
@@ -1,5 +1,5 @@
/* Print size value using units for orders of magnitude.
- Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
Based on a proposal by Larry McVoy <lm@sgi.com>.
@@ -39,7 +39,7 @@
names equal. */
# undef putc
# define putc(c, f) (wide \
- ? _IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
+ ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
# define size_t _IO_size_t
# define FILE _IO_FILE
#else /* ! USE_IN_LIBIO */
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 9a841edd8a..b0fc8f00e0 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -266,7 +266,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
va_list arg;
register const CHAR_T *f = format;
register UCHAR_T fc; /* Current character of the format. */
- register size_t done = 0; /* Assignments done. */
+ register WINT_T done = 0; /* Assignments done. */
register size_t read_in = 0; /* Chars read in. */
register WINT_T c = 0; /* Last char read. */
register int width; /* Maximum field width. */