Mon Mar 16 13:01:21 2009 UTC ()

fix sign-compare issues


(lukem)

diff -r1.20 -r1.21 src/sbin/clri/clri.c

--- src/sbin/clri/clri.c 2008/07/20 01:20:21	1.20
+++ src/sbin/clri/clri.c 2009/03/16 13:01:21	1.21

 @@ -1,14 +1,14 @@
-/*	$NetBSD: clri.c,v 1.20 2008/07/20 01:20:21 lukem Exp $	*/
+/*	$NetBSD: clri.c,v 1.21 2009/03/16 13:01:21 lukem Exp $	*/
 /*
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rich $alz of BBN Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)clri.c	8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: clri.c,v 1.20 2008/07/20 01:20:21 lukem Exp $");
+__RCSID("$NetBSD: clri.c,v 1.21 2009/03/16 13:01:21 lukem Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 #include <err.h>
 #include <errno.h>
 @@ -112,27 +112,27 @@ main(int argc, char *argv[])
 			break;
 		case FS_UFS2_MAGIC_SWAPPED:
 			is_ufs2 = 1;
 			/*FALLTHROUGH*/
 		case FS_UFS1_MAGIC_SWAPPED:
 			needswap = 1;
 			break;
 		default:
 			continue;
+		}
 		/* check we haven't found an alternate */
 		if (is_ufs2 || sbp->fs_old_flags & FS_FLAGS_UPDATED) {
-			if (sblockloc != ufs_rw64(sbp->fs_sblockloc, needswap))
+			if ((uint64_t)sblockloc != ufs_rw64(sbp->fs_sblockloc, needswap))
 				continue;
 		} else {
 			if (sblockloc == SBLOCK_UFS2)
 				continue;
+		}
 		break;
+	}
 	/* check that inode numbers are valid */
 	imax = ufs_rw32(sbp->fs_ncg, needswap) *
 		ufs_rw32(sbp->fs_ipg, needswap);
 	for (i = 1; i < (argc - 1); i++)
 @@ -156,43 +156,43 @@ main(int argc, char *argv[])
 	while (*++argv) {
 		/* get the inode number. */
 		inonum = atoi(*argv);
 		(void)printf("clearing %d\n", inonum);
 		/* read in the appropriate block. */
 		offset = ino_to_fsba(sbp, inonum);	/* inode to fs blk */
 		offset = fsbtodb(sbp, offset);		/* fs blk disk blk */
 		offset *= DEV_BSIZE;			/* disk blk to bytes */
 		/* seek and read the block */
 		if (lseek(fd, offset, SEEK_SET) < 0)
 			err(1, "%s", fs);
-		if (read(fd, ibuf, bsize) != bsize)
+		if ((size_t)read(fd, ibuf, bsize) != bsize)
 			err(1, "%s", fs);
 		/* get the inode within the block. */
 		if (is_ufs2) {
 			ip2 = &((struct ufs2_dinode *)ibuf)
 			    [ino_to_fsbo(sbp, inonum)];
 			/* clear the inode, and bump the generation count. */
 			generation = ip2->di_gen + 1;
 			memset(ip2, 0, sizeof(*ip2));
 			ip2->di_gen = generation;
 		} else {
 			ip1 = &((struct ufs1_dinode *)ibuf)
 			    [ino_to_fsbo(sbp, inonum)];
 			/* clear the inode, and bump the generation count. */
 			generation = ip1->di_gen + 1;
 			memset(ip1, 0, sizeof(*ip1));
 			ip1->di_gen = generation;
+		}
 		/* backup and write the block */
 		if (lseek(fd, offset, SEEK_SET) < 0)
 			err(1, "%s", fs);
-		if (write(fd, ibuf, bsize) != bsize)
+		if ((size_t)write(fd, ibuf, bsize) != bsize)
 			err(1, "%s", fs);
 		(void)fsync(fd);
+	}
 	(void)close(fd);
 	exit(0);
+}