Module Name: src
Committed By: lukem
Date: Sun Apr 5 12:03:48 UTC 2009
Modified Files:
src/usr.sbin/installboot: ffs.c
Log Message:
fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/installboot/ffs.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.sbin/installboot/ffs.c
diff -u src/usr.sbin/installboot/ffs.c:1.26 src/usr.sbin/installboot/ffs.c:1.27
--- src/usr.sbin/installboot/ffs.c:1.26 Sun Oct 12 16:03:27 2008
+++ src/usr.sbin/installboot/ffs.c Sun Apr 5 12:03:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.26 2008/10/12 16:03:27 apb Exp $ */
+/* $NetBSD: ffs.c,v 1.27 2009/04/05 12:03:48 lukem Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.26 2008/10/12 16:03:27 apb Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.27 2009/04/05 12:03:48 lukem Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -232,7 +232,7 @@
#endif
rv = (*callback)(params, state,
fsbtodb(fs, blk) + params->fstype->offset,
- sblksize(fs, inode->di_size, lblk));
+ sblksize(fs, (int64_t)inode->di_size, lblk));
lblk++;
nblk--;
if (rv != 1)
@@ -263,7 +263,7 @@
char inodebuf[MAXBSIZE];
struct ufs2_dinode *inode;
int level_i;
- int64_t blk, lblk, nblk;
+ int64_t blk, lblk, nblk;
int rv;
#define LEVELS 4
struct {
@@ -368,7 +368,7 @@
#endif
rv = (*callback)(params, state,
fsbtodb(fs, blk) + params->fstype->offset,
- sblksize(fs, inode->di_size, lblk));
+ sblksize(fs, (int64_t)inode->di_size, lblk));
lblk++;
nblk--;
if (rv != 1)
