Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sign-compare fix

Browse Source
This commit is contained in:
lukem 2009-01-31 00:08:05 +00:00
parent b85179b9a1
commit e1e343f9f7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/stdio/fread.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fread.c,v 1.16 2003/08/07 16:43:25 agc Exp $ */
/* $NetBSD: fread.c,v 1.17 2009/01/31 00:09:58 lukem 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.16 2003/08/07 16:43:25 agc Exp $");
__RCSID("$NetBSD: fread.c,v 1.17 2009/01/31 00:09:58 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -75,7 +75,7 @@ fread(buf, size, count, fp)
fp->_r = 0;
total = resid;
p = buf;
while (resid > (r = fp->_r)) {
while (resid > (size_t)(r = fp->_r)) {
(void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
fp->_p += r;
/* fp->_r = 0 ... done in __srefill */

8
lib/libc/stdio/fseeko.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fseeko.c,v 1.7 2008/03/13 15:40:00 christos Exp $ */
/* $NetBSD: fseeko.c,v 1.8 2009/01/31 00:08:05 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fseeko.c,v 1.7 2008/03/13 15:40:00 christos Exp $");
__RCSID("$NetBSD: fseeko.c,v 1.8 2009/01/31 00:08:05 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -203,7 +203,7 @@ fseeko(FILE *fp, off_t offset, int whence)
* skip this; see fgetln.c.)
*/
if ((fp->_flags & __SMOD) == 0 &&
target >= curoff && target < curoff + n) {
target >= curoff && target < (fpos_t)(curoff + n)) {
int o = (int)(target - curoff);
fp->_p = fp->_bf._base + o;
@ -233,7 +233,7 @@ fseeko(FILE *fp, off_t offset, int whence)
fp->_flags &= ~__SEOF;
n = (int)(target - curoff);
if (n) {
if (__srefill(fp) || fp->_r < n)
if (__srefill(fp) || (size_t)fp->_r < n)
goto dumb;
fp->_p += n;
fp->_r -= n;