Index: sbin/fsck_ffs/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sbin/fsck_ffs/Makefile	4 Dec 2001 02:19:46 -0000	1.10
+++ sbin/fsck_ffs/Makefile	22 Jul 2002 02:26:33 -0000
@@ -7,7 +7,8 @@
 MAN=	fsck_ffs.8
 SRCS=	dir.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
-WARNS=	0
+CFLAGS+=-I${.CURDIR}
+WARNS=	4
 
 .PATH:	${.CURDIR}/../../sys/ufs/ffs
 
Index: sbin/fsck_ffs/dir.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/dir.c,v
retrieving revision 1.23
diff -u -r1.23 dir.c
--- sbin/fsck_ffs/dir.c	21 Jun 2002 06:17:58 -0000	1.23
+++ sbin/fsck_ffs/dir.c	22 Jul 2002 02:12:56 -0000
@@ -333,8 +333,9 @@
 				cmd.value = idesc->id_number;
 				cmd.size = -lcnt;
 				if (debug)
-					printf("adjrefcnt ino %ld amt %ld\n",
-					    (long)cmd.value, cmd.size);
+					printf("adjrefcnt ino %ld amt %lld\n",
+					    (long)cmd.value,
+					    (long long)cmd.size);
 				if (sysctl(adjrefcnt, MIBSIZE, 0, 0,
 				    &cmd, sizeof cmd) == -1)
 					rwerror("ADJUST INODE", cmd.value);
Index: sbin/fsck_ffs/fsck.h
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/fsck.h,v
retrieving revision 1.25
diff -u -r1.25 fsck.h
--- sbin/fsck_ffs/fsck.h	21 Jun 2002 06:17:58 -0000	1.25
+++ sbin/fsck_ffs/fsck.h	22 Jul 2002 02:20:08 -0000
@@ -149,7 +149,8 @@
 
 struct inodesc {
 	enum fixstate id_fix;	/* policy on fixing errors */
-	int (*id_func)();	/* function to be applied to blocks of inode */
+	int (*id_func)(struct inodesc *);
+				/* function to be applied to blocks of inode */
 	ino_t id_number;	/* inode number described */
 	ino_t id_parent;	/* for DATA nodes, their parent */
 	ufs_lbn_t id_lbn;	/* logical block number of current block */
Index: sbin/fsck_ffs/fsutil.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/fsutil.c,v
retrieving revision 1.14
diff -u -r1.14 fsutil.c
--- sbin/fsck_ffs/fsutil.c	21 Jun 2002 06:17:58 -0000	1.14
+++ sbin/fsck_ffs/fsutil.c	22 Jul 2002 02:12:21 -0000
@@ -236,9 +236,9 @@
 		return;
 	}
 	if (bp->b_errs != 0)
-		pfatal("WRITING %sZERO'ED BLOCK %d TO DISK\n",
+		pfatal("WRITING %sZERO'ED BLOCK %lld TO DISK\n",
 		    (bp->b_errs == bp->b_size / dev_bsize) ? "" : "PARTIALLY ",
-		    bp->b_bno);
+		    (long long)bp->b_bno);
 	bp->b_errs = 0;
 	bwrite(fd, bp->b_un.b_buf, bp->b_bno, (long)bp->b_size);
 	if (bp != &sblk)
@@ -360,11 +360,11 @@
 		if (read(fd, cp, (int)secsize) != secsize) {
 			(void)lseek(fd, offset + i + secsize, 0);
 			if (secsize != dev_bsize && dev_bsize != 1)
-				printf(" %ld (%ld),",
-				    (blk * dev_bsize + i) / secsize,
-				    blk + i / dev_bsize);
+				printf(" %lld (%lld),",
+				    (long long)(blk * dev_bsize + i) / secsize,
+				    (long long)blk + i / dev_bsize);
 			else
-				printf(" %ld,", blk + i / dev_bsize);
+				printf(" %lld,", (long long)blk + i / dev_bsize);
 			errs++;
 		}
 	}
@@ -399,7 +399,7 @@
 	for (cp = buf, i = 0; i < size; i += dev_bsize, cp += dev_bsize)
 		if (write(fd, cp, (int)dev_bsize) != dev_bsize) {
 			(void)lseek(fd, offset + i + dev_bsize, 0);
-			printf(" %ld,", blk + i / dev_bsize);
+			printf(" %lld,", (long long)blk + i / dev_bsize);
 		}
 	printf("\n");
 	return;
Index: sbin/fsck_ffs/inode.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/inode.c,v
retrieving revision 1.31
diff -u -r1.31 inode.c
--- sbin/fsck_ffs/inode.c	21 Jun 2002 06:17:58 -0000	1.31
+++ sbin/fsck_ffs/inode.c	22 Jul 2002 02:20:41 -0000
@@ -156,7 +156,7 @@
 iblock(struct inodesc *idesc, long ilevel, off_t isize)
 {
 	struct bufarea *bp;
-	int i, n, (*func)(), nif;
+	int i, n, (*func)(struct inodesc *), nif;
 	off_t sizepb;
 	char buf[BUFSIZ];
 	char pathbuf[MAXPATHLEN + 1];
@@ -492,8 +492,8 @@
 			cmd.value = idesc->id_number;
 			cmd.size = -DIP(dp, di_nlink);
 			if (debug)
-				printf("adjrefcnt ino %ld amt %ld\n",
-				    (long)cmd.value, cmd.size);
+				printf("adjrefcnt ino %ld amt %lld\n",
+				    (long)cmd.value, (long long)cmd.size);
 			if (sysctl(adjrefcnt, MIBSIZE, 0, 0,
 			    &cmd, sizeof cmd) == -1)
 				rwerror("ADJUST INODE", cmd.value);
Index: sbin/fsck_ffs/main.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/main.c,v
retrieving revision 1.33
diff -u -r1.33 main.c
--- sbin/fsck_ffs/main.c	21 Jun 2002 06:17:58 -0000	1.33
+++ sbin/fsck_ffs/main.c	22 Jul 2002 02:23:01 -0000
@@ -295,8 +295,9 @@
 	clean:
 		pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree +
 		    sblock.fs_frag * sblock.fs_cstotal.cs_nbfree));
-		printf("(%d frags, %d blocks, %.1f%% fragmentation)\n",
-		    sblock.fs_cstotal.cs_nffree, sblock.fs_cstotal.cs_nbfree,
+		printf("(%lld frags, %lld blocks, %.1f%% fragmentation)\n",
+		    (long long)sblock.fs_cstotal.cs_nffree,
+		    (long long)sblock.fs_cstotal.cs_nbfree,
 		    sblock.fs_cstotal.cs_nffree * 100.0 / sblock.fs_dsize);
 		return (0);
 	}
@@ -368,22 +369,23 @@
 	blks = maxfsblock - (n_ffree + sblock.fs_frag * n_bfree) - blks;
 	if (bkgrdflag && (files > 0 || blks > 0)) {
 		countdirs = sblock.fs_cstotal.cs_ndir - countdirs;
-		pwarn("Reclaimed: %ld directories, %ld files, %d fragments\n",
-		    countdirs, (long)files - countdirs, blks);
+		pwarn("Reclaimed: %ld directories, %ld files, %lld fragments\n",
+		    countdirs, (long)files - countdirs, (long long)blks);
 	}
-	pwarn("%ld files, %ld used, %qu free ",
-	    (long)n_files, (long)n_blks, n_ffree + sblock.fs_frag * n_bfree);
+	pwarn("%ld files, %lld used, %llu free ",
+	    (long)n_files, (long long)n_blks,
+	    n_ffree + sblock.fs_frag * n_bfree);
 	printf("(%qu frags, %qu blocks, %.1f%% fragmentation)\n",
 	    n_ffree, n_bfree, n_ffree * 100.0 / sblock.fs_dsize);
 	if (debug) {
 		if (files < 0)
 			printf("%d inodes missing\n", -files);
 		if (blks < 0)
-			printf("%d blocks missing\n", -blks);
+			printf("%lld blocks missing\n", -(long long)blks);
 		if (duplist != NULL) {
 			printf("The following duplicate blocks remain:");
 			for (dp = duplist; dp; dp = dp->next)
-				printf(" %d,", dp->dup);
+				printf(" %lld,", (long long)dp->dup);
 			printf("\n");
 		}
 		if (zlnhead != NULL) {
Index: sbin/fsck_ffs/pass1.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/pass1.c,v
retrieving revision 1.31
diff -u -r1.31 pass1.c
--- sbin/fsck_ffs/pass1.c	26 Jun 2002 18:34:47 -0000	1.31
+++ sbin/fsck_ffs/pass1.c	22 Jul 2002 02:16:36 -0000
@@ -190,7 +190,6 @@
 	off_t kernmaxfilesize;
 	ufs2_daddr_t ndb;
 	mode_t mode;
-	char *symbuf;
 	int j;
 
 	dp = getnextinode(inumber);
@@ -347,8 +346,8 @@
 			cmd.value = idesc->id_number;
 			cmd.size = idesc->id_entryno - DIP(dp, di_blocks);
 			if (debug)
-				printf("adjblkcnt ino %qu amount %ld\n",
-				    cmd.value, cmd.size);
+				printf("adjblkcnt ino %qu amount %lld\n",
+				    cmd.value, (long long)cmd.size);
 			if (sysctl(adjblkcnt, MIBSIZE, 0, 0,
 			    &cmd, sizeof cmd) == -1)
 				rwerror("ADJUST INODE BLOCK COUNT", cmd.value);
Index: sbin/fsck_ffs/preen.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/preen.c,v
retrieving revision 1.21
diff -u -r1.21 preen.c
--- sbin/fsck_ffs/preen.c	20 Mar 2002 22:57:09 -0000	1.21
+++ sbin/fsck_ffs/preen.c	22 Jul 2002 02:26:11 -0000
@@ -136,8 +136,12 @@
 				printf("Unknown pid %d\n", pid);
 				continue;
 			}
-			if (WIFEXITED(status))
+			if (WIFEXITED(status)) {
 				retcode = WEXITSTATUS(status);
+				printf("PID %d %s (%s) exited status %d\n",
+				    pid, dk->part->name, dk->part->fsname,
+				    retcode);
+			}
 			else
 				retcode = 0;
 			if (WIFSIGNALED(status)) {
Index: sbin/fsck_ffs/setup.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/setup.c,v
retrieving revision 1.33
diff -u -r1.33 setup.c
--- sbin/fsck_ffs/setup.c	21 Jun 2002 06:17:58 -0000	1.33
+++ sbin/fsck_ffs/setup.c	22 Jul 2002 02:16:48 -0000
@@ -74,7 +74,6 @@
 {
 	long cg, asked, i, j;
 	long bmapsize;
-	off_t sizepb;
 	struct stat statb;
 	struct fs proto;
 	size_t size;
Index: sys/ufs/ffs/ffs_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/ufs/ffs/ffs_subr.c,v
retrieving revision 1.32
diff -u -r1.32 ffs_subr.c
--- sys/ufs/ffs/ffs_subr.c	23 Jun 2002 18:17:26 -0000	1.32
+++ sys/ufs/ffs/ffs_subr.c	22 Jul 2002 02:17:55 -0000
@@ -39,6 +39,7 @@
 #ifndef _KERNEL
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
+#include "fsck.h"
 #else
 #include "opt_ddb.h"