Module Name: src
Committed By: lukem
Date: Sat Apr 18 06:24:05 UTC 2009
Modified Files:
src/usr.bin/cmp: regular.c
Log Message:
Compare size_t vs off_t by casting both to uintmax_t
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/cmp/regular.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/cmp/regular.c
diff -u src/usr.bin/cmp/regular.c:1.21 src/usr.bin/cmp/regular.c:1.22
--- src/usr.bin/cmp/regular.c:1.21 Sat Apr 11 12:16:12 2009
+++ src/usr.bin/cmp/regular.c Sat Apr 18 06:24:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: regular.c,v 1.21 2009/04/11 12:16:12 lukem Exp $ */
+/* $NetBSD: regular.c,v 1.22 2009/04/18 06:24:05 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: regular.c,v 1.21 2009/04/11 12:16:12 lukem Exp $");
+__RCSID("$NetBSD: regular.c,v 1.22 2009/04/18 06:24:05 lukem Exp $");
#endif
#endif /* not lint */
@@ -73,7 +73,7 @@
dfound = 0;
length = MIN(len1, len2);
for (blk_sz = 1024 * 1024; length != 0; length -= blk_sz) {
- if (blk_sz > (uint64_t)length)
+ if ((uintmax_t)blk_sz > (uintmax_t)length)
blk_sz = length;
p1 = mmap(NULL, blk_sz, PROT_READ, MAP_FILE|MAP_SHARED,
fd1, skip1);
