summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdio/ungetc.c
diff options
context:
space:
mode:
authorjraynard <jraynard@FreeBSD.org>1996-06-22 10:34:15 +0000
committerjraynard <jraynard@FreeBSD.org>1996-06-22 10:34:15 +0000
commitfac2ce3b1236438834d415410078fc73bacc4fcd (patch)
treedabe76e239303cbaa8026d6b9fa85fe1b5845601 /lib/libc/stdio/ungetc.c
parent1649c2ccee0c009a07ac7e86ad4c7681345a7c24 (diff)
downloadFreeBSD-src-fac2ce3b1236438834d415410078fc73bacc4fcd.zip
FreeBSD-src-fac2ce3b1236438834d415410078fc73bacc4fcd.tar.gz
Suggested by: Bruce Evans, Jeffrey Hsu, Gary Palmer
Added $Id$'s to files that were lacking them (gpalmer), made some cosmetic changes to conform to style guidelines (bde) and checked against NetBSD and Lite2 to remove unnecessary divergences (hsu, bde) One last code cleanup:- Removed spurious casts in fseek.c and stdio.c. Added missing function argument in fwalk.c. Added missing header include in flags.c and rget.c. Put in casts where int's were being passed as size_t's. Put in missing prototypes for static functions. Changed second args of __sflags() inflags.c and writehook() in vasprintf.c from char * to const char * to conform to prototypes. This directory now compiles with no warnings with -Wall under gcc-2.6.3 and with considerably less warnings than before with the ultra-pedantic script I used for testing. (Most of the remaining ones are due to const poisoning).
Diffstat (limited to 'lib/libc/stdio/ungetc.c')
-rw-r--r--lib/libc/stdio/ungetc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 25f59d7..c0355b7 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -35,7 +35,11 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
static char sccsid[] = "@(#)ungetc.c 8.2 (Berkeley) 11/3/93";
+#endif
+static const char rcsid[] =
+ "$Id$";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@@ -47,6 +51,8 @@ static char sccsid[] = "@(#)ungetc.c 8.2 (Berkeley) 11/3/93";
#include "pthread_private.h"
#endif
+static int __submore __P((FILE *));
+
/*
* Expand the ungetc buffer `in place'. That is, adjust fp->_p when
* the buffer moves, so that it points the same distance from the end,
@@ -75,7 +81,7 @@ __submore(fp)
return (0);
}
i = fp->_ub._size;
- p = realloc(fp->_ub._base, i << 1);
+ p = realloc(fp->_ub._base, (size_t)(i << 1));
if (p == NULL)
return (EOF);
/* no overlap (hence can use memcpy) because we doubled the size */
OpenPOWER on IntegriCloud