Module Name: src
Committed By: christos
Date: Sun Aug 14 12:37:09 UTC 2011
Modified Files:
src/sys/kern: vfs_wapbl.c
src/sys/ufs/ffs: ffs_subr.c
Log Message:
fix sign-compare warnings
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.46 -r1.47 src/sys/ufs/ffs/ffs_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.45 src/sys/kern/vfs_wapbl.c:1.46
--- src/sys/kern/vfs_wapbl.c:1.45 Sat Jun 11 23:35:57 2011
+++ src/sys/kern/vfs_wapbl.c Sun Aug 14 08:37:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.45 2011/06/12 03:35:57 rmind Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.46 2011/08/14 12:37:09 christos Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.45 2011/06/12 03:35:57 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.46 2011/08/14 12:37:09 christos Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -1043,9 +1043,9 @@
off_t new;
/* Define acceptable ranges for inputs. */
- KASSERT(delta <= size);
- KASSERT((old == 0) || (old >= off));
- KASSERT(old < (size + off));
+ KASSERT(delta <= (size_t)size);
+ KASSERT((old == 0) || ((size_t)old >= off));
+ KASSERT(old < (off_t)(size + off));
if ((old == 0) && (delta != 0))
new = off + delta;
@@ -1060,8 +1060,8 @@
KASSERT((delta != (size)) || (new == old));
/* Define acceptable ranges for output. */
- KASSERT((new == 0) || (new >= off));
- KASSERT(new < (size + off));
+ KASSERT((new == 0) || ((size_t)new >= off));
+ KASSERT((size_t)new < (size + off));
return new;
}
Index: src/sys/ufs/ffs/ffs_subr.c
diff -u src/sys/ufs/ffs/ffs_subr.c:1.46 src/sys/ufs/ffs/ffs_subr.c:1.47
--- src/sys/ufs/ffs/ffs_subr.c:1.46 Sun Mar 6 12:08:38 2011
+++ src/sys/ufs/ffs/ffs_subr.c Sun Aug 14 08:37:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_subr.c,v 1.46 2011/03/06 17:08:38 bouyer Exp $ */
+/* $NetBSD: ffs_subr.c,v 1.47 2011/08/14 12:37:09 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.46 2011/03/06 17:08:38 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.47 2011/08/14 12:37:09 christos Exp $");
#include <sys/param.h>
@@ -308,7 +308,7 @@
*/
start = blkno + 1;
end = start + fs->fs_contigsumsize;
- if (end >= ufs_rw32(cgp->cg_nclusterblks, needswap))
+ if ((uint32_t)end >= ufs_rw32(cgp->cg_nclusterblks, needswap))
end = ufs_rw32(cgp->cg_nclusterblks, needswap);
mapp = &freemapp[start / NBBY];
map = *mapp++;
