Module Name: src
Committed By: christos
Date: Sun Oct 25 20:44:13 UTC 2009
Modified Files:
src/lib/libc/stdio: asprintf.c fgets.c fgetwc.c fread.c fvwrite.c
getdelim.c setbuffer.c stdio.c tempnam.c ungetc.c vasprintf.c
vfwprintf.c vsnprintf_ss.c
Log Message:
revert some of dsl's changes to make things build on i386; he can undo what
he wants when he comes back.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/stdio/asprintf.c \
src/lib/libc/stdio/vfwprintf.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/stdio/fgets.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/stdio/fgetwc.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/stdio/fread.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/stdio/fvwrite.c \
src/lib/libc/stdio/tempnam.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/stdio/getdelim.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/stdio/setbuffer.c \
src/lib/libc/stdio/vasprintf.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/stdio/stdio.c \
src/lib/libc/stdio/ungetc.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdio/vsnprintf_ss.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/asprintf.c
diff -u src/lib/libc/stdio/asprintf.c:1.17 src/lib/libc/stdio/asprintf.c:1.18
--- src/lib/libc/stdio/asprintf.c:1.17 Sun Oct 25 13:09:34 2009
+++ src/lib/libc/stdio/asprintf.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asprintf.c,v 1.17 2009/10/25 17:09:34 dsl Exp $ */
+/* $NetBSD: asprintf.c,v 1.18 2009/10/25 20:44:13 christos Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <todd.mil...@courtesan.com>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: asprintf.c,v 1.17 2009/10/25 17:09:34 dsl Exp $");
+__RCSID("$NetBSD: asprintf.c,v 1.18 2009/10/25 20:44:13 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -60,7 +60,7 @@
_FILEEXT_SETUP(&f, &fext);
f._file = -1;
f._flags = __SWR | __SSTR | __SALC;
- f._bf._base = f._p = malloc(128);
+ f._bf._base = f._p = malloc((size_t)128);
if (f._bf._base == NULL)
goto err;
f._bf._size = f._w = 127; /* Leave room for the NUL */
@@ -70,7 +70,7 @@
if (ret < 0)
goto err;
*f._p = '\0';
- _base = realloc(f._bf._base, ret + 1u);
+ _base = realloc(f._bf._base, (size_t)ret + 1);
if (_base == NULL)
goto err;
*str = (char *)_base;
Index: src/lib/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.17 src/lib/libc/stdio/vfwprintf.c:1.18
--- src/lib/libc/stdio/vfwprintf.c:1.17 Sat Oct 24 11:20:15 2009
+++ src/lib/libc/stdio/vfwprintf.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.17 2009/10/24 15:20:15 dsl Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.18 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.17 2009/10/24 15:20:15 dsl Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.18 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -316,7 +316,7 @@
case 16:
do {
- *--cp = xdigs[val & 15];
+ *--cp = xdigs[(size_t)val & 15];
val >>= 4;
} while (val);
break;
@@ -388,7 +388,7 @@
case 16:
do {
- *--cp = xdigs[val & 15];
+ *--cp = xdigs[(size_t)val & 15];
val >>= 4;
} while (val);
break;
Index: src/lib/libc/stdio/fgets.c
diff -u src/lib/libc/stdio/fgets.c:1.26 src/lib/libc/stdio/fgets.c:1.27
--- src/lib/libc/stdio/fgets.c:1.26 Sun Oct 25 13:09:34 2009
+++ src/lib/libc/stdio/fgets.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fgets.c,v 1.26 2009/10/25 17:09:34 dsl Exp $ */
+/* $NetBSD: fgets.c,v 1.27 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fgets.c 8.2 (Berkeley) 12/22/93";
#else
-__RCSID("$NetBSD: fgets.c,v 1.26 2009/10/25 17:09:34 dsl Exp $");
+__RCSID("$NetBSD: fgets.c,v 1.27 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -112,19 +112,19 @@
}
len = n;
}
- t = memchr(p, '\n', len + 0u);
+ t = memchr(p, '\n', (size_t)len);
if (t != NULL) {
len = (int)(++t - p);
fp->_r -= len;
fp->_p = t;
- (void)memcpy(s, p, len + 0u);
+ (void)memcpy(s, p, (size_t)len);
s[len] = 0;
FUNLOCKFILE(fp);
return (buf);
}
fp->_r -= len;
fp->_p += len;
- (void)memcpy(s, p, len + 0u);
+ (void)memcpy(s, p, (size_t)len);
s += len;
n -= len;
} while (n != 0);
Index: src/lib/libc/stdio/fgetwc.c
diff -u src/lib/libc/stdio/fgetwc.c:1.10 src/lib/libc/stdio/fgetwc.c:1.11
--- src/lib/libc/stdio/fgetwc.c:1.10 Sun Oct 25 13:09:34 2009
+++ src/lib/libc/stdio/fgetwc.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fgetwc.c,v 1.10 2009/10/25 17:09:34 dsl Exp $ */
+/* $NetBSD: fgetwc.c,v 1.11 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c)2001 Citrus Project,
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fgetwc.c,v 1.10 2009/10/25 17:09:34 dsl Exp $");
+__RCSID("$NetBSD: fgetwc.c,v 1.11 2009/10/25 20:44:13 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -63,7 +63,7 @@
return WEOF;
}
nr = mbrtowc(&wc, (const char *)fp->_p,
- fp->_r + 0u, &wcio->wcio_mbstate_in);
+ (size_t)fp->_r, &wcio->wcio_mbstate_in);
if (nr == (size_t)-1) {
fp->_flags |= __SERR;
return WEOF;
Index: src/lib/libc/stdio/fread.c
diff -u src/lib/libc/stdio/fread.c:1.19 src/lib/libc/stdio/fread.c:1.20
--- src/lib/libc/stdio/fread.c:1.19 Sun Oct 25 13:09:34 2009
+++ src/lib/libc/stdio/fread.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fread.c,v 1.19 2009/10/25 17:09:34 dsl Exp $ */
+/* $NetBSD: fread.c,v 1.20 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fread.c 8.2 (Berkeley) 12/11/93";
#else
-__RCSID("$NetBSD: fread.c,v 1.19 2009/10/25 17:09:34 dsl Exp $");
+__RCSID("$NetBSD: fread.c,v 1.20 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -76,7 +76,7 @@
total = resid;
p = buf;
while (resid > (size_t)(r = fp->_r)) {
- (void)memcpy(p, fp->_p, r + 0u);
+ (void)memcpy(p, fp->_p, (size_t)r);
fp->_p += r;
/* fp->_r = 0 ... done in __srefill */
p += r;
Index: src/lib/libc/stdio/fvwrite.c
diff -u src/lib/libc/stdio/fvwrite.c:1.20 src/lib/libc/stdio/fvwrite.c:1.21
--- src/lib/libc/stdio/fvwrite.c:1.20 Sun Oct 25 13:09:34 2009
+++ src/lib/libc/stdio/fvwrite.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fvwrite.c,v 1.20 2009/10/25 17:09:34 dsl Exp $ */
+/* $NetBSD: fvwrite.c,v 1.21 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fvwrite.c,v 1.20 2009/10/25 17:09:34 dsl Exp $");
+__RCSID("$NetBSD: fvwrite.c,v 1.21 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -84,7 +84,7 @@
}
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define COPY(n) (void)memcpy(fp->_p, p, (n) + 0u)
+#define COPY(n) (void)memcpy(fp->_p, p, (size_t)(n))
iov = uio->uio_iov;
p = iov->iov_base;
@@ -135,7 +135,8 @@
do {
_size = (_size << 1) + 1;
} while (_size < blen + len);
- _base = realloc(fp->_bf._base, _size + 1u);
+ _base = realloc(fp->_bf._base,
+ (size_t)(_size + 1));
if (_base == NULL)
goto err;
fp->_w += _size - fp->_bf._size;
@@ -186,7 +187,7 @@
do {
GETIOV(nlknown = 0);
if (!nlknown) {
- nl = memchr(p, '\n', len + 0u);
+ nl = memchr(p, '\n', (size_t)len);
nldist = nl ? nl + 1 - p : len + 1;
nlknown = 1;
}
Index: src/lib/libc/stdio/tempnam.c
diff -u src/lib/libc/stdio/tempnam.c:1.20 src/lib/libc/stdio/tempnam.c:1.21
--- src/lib/libc/stdio/tempnam.c:1.20 Sat Oct 24 11:20:15 2009
+++ src/lib/libc/stdio/tempnam.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tempnam.c,v 1.20 2009/10/24 15:20:15 dsl Exp $ */
+/* $NetBSD: tempnam.c,v 1.21 2009/10/25 20:44:13 christos Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tempnam.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tempnam.c,v 1.20 2009/10/24 15:20:15 dsl Exp $");
+__RCSID("$NetBSD: tempnam.c,v 1.21 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -75,24 +75,24 @@
char *name, *f;
const char *tmp;
- if (!(name = malloc(MAXPATHLEN)))
+ if (!(name = malloc((size_t)MAXPATHLEN)))
return NULL;
if (!pfx)
pfx = "tmp.";
if ((tmp = getenv("TMPDIR")) != NULL &&
- (f = gentemp(name, MAXPATHLEN, tmp, pfx)) != NULL)
+ (f = gentemp(name, (size_t)MAXPATHLEN, tmp, pfx)) != NULL)
return f;
if (dir != NULL &&
- (f = gentemp(name, MAXPATHLEN, dir, pfx)) != NULL)
+ (f = gentemp(name, (size_t)MAXPATHLEN, dir, pfx)) != NULL)
return f;
- if ((f = gentemp(name, MAXPATHLEN, P_tmpdir, pfx)) != NULL)
+ if ((f = gentemp(name, (size_t)MAXPATHLEN, P_tmpdir, pfx)) != NULL)
return f;
- if ((f = gentemp(name, MAXPATHLEN, _PATH_TMP, pfx)) != NULL)
+ if ((f = gentemp(name, (size_t)MAXPATHLEN, _PATH_TMP, pfx)) != NULL)
return f;
sverrno = errno;
Index: src/lib/libc/stdio/getdelim.c
diff -u src/lib/libc/stdio/getdelim.c:1.6 src/lib/libc/stdio/getdelim.c:1.7
--- src/lib/libc/stdio/getdelim.c:1.6 Sun Oct 25 13:09:34 2009
+++ src/lib/libc/stdio/getdelim.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: getdelim.c,v 1.6 2009/10/25 17:09:34 dsl Exp $ */
+/* $NetBSD: getdelim.c,v 1.7 2009/10/25 20:44:13 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: getdelim.c,v 1.6 2009/10/25 17:09:34 dsl Exp $");
+__RCSID("$NetBSD: getdelim.c,v 1.7 2009/10/25 20:44:13 christos Exp $");
#include "namespace.h"
@@ -83,7 +83,7 @@
}
/* Scan through looking for the separator */
- p = memchr(fp->_p, sep, fp->_r + 0u);
+ p = memchr(fp->_p, sep, (size_t)fp->_r);
if (p == NULL)
len = fp->_r;
else
@@ -119,7 +119,7 @@
*buflen = newlen;
}
- (void)memcpy(*buf + off, fp->_p, len);
+ (void)memcpy((*buf + off), fp->_p, len);
/* Safe, len is never greater than what fp->_r can fit. */
fp->_r -= (int)len;
fp->_p += (int)len;
Index: src/lib/libc/stdio/setbuffer.c
diff -u src/lib/libc/stdio/setbuffer.c:1.11 src/lib/libc/stdio/setbuffer.c:1.12
--- src/lib/libc/stdio/setbuffer.c:1.11 Sat Oct 24 11:20:15 2009
+++ src/lib/libc/stdio/setbuffer.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: setbuffer.c,v 1.11 2009/10/24 15:20:15 dsl Exp $ */
+/* $NetBSD: setbuffer.c,v 1.12 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)setbuffer.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: setbuffer.c,v 1.11 2009/10/24 15:20:15 dsl Exp $");
+__RCSID("$NetBSD: setbuffer.c,v 1.12 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -55,7 +55,7 @@
_DIAGASSERT(fp != NULL);
/* buf may be NULL */
- (void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, size);
+ (void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, (size_t)size);
}
/*
@@ -68,5 +68,5 @@
_DIAGASSERT(fp != NULL);
- return (setvbuf(fp, NULL, _IOLBF, 0));
+ return (setvbuf(fp, NULL, _IOLBF, (size_t)0));
}
Index: src/lib/libc/stdio/vasprintf.c
diff -u src/lib/libc/stdio/vasprintf.c:1.11 src/lib/libc/stdio/vasprintf.c:1.12
--- src/lib/libc/stdio/vasprintf.c:1.11 Sat Oct 24 11:20:15 2009
+++ src/lib/libc/stdio/vasprintf.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vasprintf.c,v 1.11 2009/10/24 15:20:15 dsl Exp $ */
+/* $NetBSD: vasprintf.c,v 1.12 2009/10/25 20:44:13 christos Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <todd.mil...@courtesan.com>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vasprintf.c,v 1.11 2009/10/24 15:20:15 dsl Exp $");
+__RCSID("$NetBSD: vasprintf.c,v 1.12 2009/10/25 20:44:13 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -64,7 +64,7 @@
if (ret == -1)
goto err;
*f._p = '\0';
- _base = realloc(f._bf._base, ret + 1);
+ _base = realloc(f._bf._base, (size_t)(ret + 1));
if (_base == NULL)
goto err;
*str = (char *)_base;
Index: src/lib/libc/stdio/stdio.c
diff -u src/lib/libc/stdio/stdio.c:1.15 src/lib/libc/stdio/stdio.c:1.16
--- src/lib/libc/stdio/stdio.c:1.15 Sat Oct 24 11:20:15 2009
+++ src/lib/libc/stdio/stdio.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.c,v 1.15 2009/10/24 15:20:15 dsl Exp $ */
+/* $NetBSD: stdio.c,v 1.16 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)stdio.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: stdio.c,v 1.15 2009/10/24 15:20:15 dsl Exp $");
+__RCSID("$NetBSD: stdio.c,v 1.16 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,7 +68,7 @@
_DIAGASSERT(fp != NULL);
_DIAGASSERT(buf != NULL);
- ret = read(__sfileno(fp), buf, n);
+ ret = read(__sfileno(fp), buf, (size_t)n);
/* if the read succeeded, update the current offset */
if (ret >= 0)
fp->_offset += ret;
@@ -91,7 +91,7 @@
if (fp->_flags & __SAPP)
(void) lseek(__sfileno(fp), (off_t)0, SEEK_END);
fp->_flags &= ~__SOFF; /* in case FAPPEND mode is set */
- return write(__sfileno(fp), buf, n);
+ return write(__sfileno(fp), buf, (size_t)n);
}
fpos_t
Index: src/lib/libc/stdio/ungetc.c
diff -u src/lib/libc/stdio/ungetc.c:1.15 src/lib/libc/stdio/ungetc.c:1.16
--- src/lib/libc/stdio/ungetc.c:1.15 Sat Oct 24 11:20:15 2009
+++ src/lib/libc/stdio/ungetc.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ungetc.c,v 1.15 2009/10/24 15:20:15 dsl Exp $ */
+/* $NetBSD: ungetc.c,v 1.16 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ungetc.c 8.2 (Berkeley) 11/3/93";
#else
-__RCSID("$NetBSD: ungetc.c,v 1.15 2009/10/24 15:20:15 dsl Exp $");
+__RCSID("$NetBSD: ungetc.c,v 1.16 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,7 +69,7 @@
/*
* Get a new buffer (rather than expanding the old one).
*/
- if ((p = malloc(BUFSIZ)) == NULL)
+ if ((p = malloc((size_t)BUFSIZ)) == NULL)
return (EOF);
_UB(fp)._base = p;
_UB(fp)._size = BUFSIZ;
@@ -80,11 +80,11 @@
return (0);
}
i = _UB(fp)._size;
- p = realloc(_UB(fp)._base, (i << 1));
+ p = realloc(_UB(fp)._base, (size_t)(i << 1));
if (p == NULL)
return (EOF);
/* no overlap (hence can use memcpy) because we doubled the size */
- (void)memcpy(p + i, p, i);
+ (void)memcpy((p + i), p, (size_t)i);
fp->_p = p + i;
_UB(fp)._base = p;
_UB(fp)._size = i << 1;
Index: src/lib/libc/stdio/vsnprintf_ss.c
diff -u src/lib/libc/stdio/vsnprintf_ss.c:1.7 src/lib/libc/stdio/vsnprintf_ss.c:1.8
--- src/lib/libc/stdio/vsnprintf_ss.c:1.7 Sat Oct 24 11:20:15 2009
+++ src/lib/libc/stdio/vsnprintf_ss.c Sun Oct 25 16:44:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vsnprintf_ss.c,v 1.7 2009/10/24 15:20:15 dsl Exp $ */
+/* $NetBSD: vsnprintf_ss.c,v 1.8 2009/10/25 20:44:13 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vsnprintf_ss.c,v 1.7 2009/10/24 15:20:15 dsl Exp $");
+__RCSID("$NetBSD: vsnprintf_ss.c,v 1.8 2009/10/25 20:44:13 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -326,7 +326,7 @@
* NUL in the first `prec' characters, and
* strlen() will go further.
*/
- char *p = memchr(cp, 0, prec);
+ char *p = memchr(cp, 0, (size_t)prec);
if (p != NULL) {
size = p - cp;
@@ -400,7 +400,7 @@
case HEX:
do {
- *--cp = xdigs[_uquad & 15];
+ *--cp = xdigs[(size_t)_uquad & 15];
_uquad >>= 4;
} while (_uquad);
break;
