partial sync with netbsd 960418, more to come

6 files changed, 34 insertions, 30 deletions

diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 8386bd839d1..a4bea4eb5d1 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: ffs_alloc.c,v 1.2 1996/02/27 07:27:34 niklas Exp $	*/
-/*	$NetBSD: ffs_alloc.c,v 1.9 1996/02/09 22:22:18 christos Exp $	*/
+/*	$OpenBSD: ffs_alloc.c,v 1.3 1996/04/21 22:32:28 deraadt Exp $	*/
+/*	$NetBSD: ffs_alloc.c,v 1.10 1996/03/17 02:16:18 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -1223,7 +1223,7 @@ ffs_blkfree(ip, bno, size)
 
 	fs = ip->i_fs;
 	if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) {
-		printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
+		printf("dev = 0x%x, bsize = %d, size = %ld, fs = %s\n",
 		    ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);
 		panic("blkfree: bad size");
 	}
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index b532f86d4af..e5d0c350387 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: ffs_subr.c,v 1.2 1996/02/27 07:27:39 niklas Exp $	*/
-/*	$NetBSD: ffs_subr.c,v 1.5 1996/02/09 22:22:24 christos Exp $	*/
+/*	$OpenBSD: ffs_subr.c,v 1.3 1996/04/21 22:32:33 deraadt Exp $	*/
+/*	$NetBSD: ffs_subr.c,v 1.6 1996/03/17 02:16:23 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -146,7 +146,7 @@ ffs_checkoverlap(bp, ip)
 		    ep->b_blkno + btodb(ep->b_bcount) <= start)
 			continue;
 		vprint("Disk overlap", vp);
-		(void)printf("\tstart %d, end %d overlap start %d, end %d\n",
+		(void)printf("\tstart %d, end %d overlap start %d, end %ld\n",
 			start, last, ep->b_blkno,
 			ep->b_blkno + btodb(ep->b_bcount) - 1);
 		panic("Disk buffer overlap");
diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c
index 5f6ecc4426b..b499ebd5b06 100644
--- a/sys/ufs/lfs/lfs_alloc.c
+++ b/sys/ufs/lfs/lfs_alloc.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: lfs_alloc.c,v 1.3 1996/03/19 21:10:51 mickey Exp $	*/
-/*	$NetBSD: lfs_alloc.c,v 1.3 1996/02/09 22:28:47 christos Exp $	*/
+/*	$OpenBSD: lfs_alloc.c,v 1.4 1996/04/21 22:32:39 deraadt Exp $	*/
+/*	$NetBSD: lfs_alloc.c,v 1.4 1996/03/25 12:53:37 pk Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -167,7 +167,10 @@ lfs_vcreate(mp, ino, vpp)
 	extern int (**lfs_vnodeop_p) __P((void *));
 	struct inode *ip;
 	struct ufsmount *ump;
-	int error, i;
+	int error;
+#ifdef QUOTA
+	int i;
+#endif
 
 	/* Create the vnode. */
 	if ((error = getnewvnode(VT_LFS, mp, lfs_vnodeop_p, vpp)) != 0) {
diff --git a/sys/ufs/lfs/lfs_debug.c b/sys/ufs/lfs/lfs_debug.c
index ed21ac0dfa4..dea18884d51 100644
--- a/sys/ufs/lfs/lfs_debug.c
+++ b/sys/ufs/lfs/lfs_debug.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: lfs_debug.c,v 1.2 1996/02/27 07:13:23 niklas Exp $	*/
-/*	$NetBSD: lfs_debug.c,v 1.3 1996/02/12 22:08:47 christos Exp $	*/
+/*	$OpenBSD: lfs_debug.c,v 1.3 1996/04/21 22:32:42 deraadt Exp $	*/
+/*	$NetBSD: lfs_debug.c,v 1.4 1996/03/17 02:16:28 christos Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -54,7 +54,7 @@ lfs_dump_super(lfsp)
 {
 	int i;
 
-	(void)printf("%s%lx\t%s%lx\t%s%d\t%s%d\n",
+	(void)printf("%s%x\t%s%x\t%s%d\t%s%d\n",
 		"magic    ", lfsp->lfs_magic,
 		"version  ", lfsp->lfs_version,
 		"size     ", lfsp->lfs_size,
@@ -77,19 +77,19 @@ lfs_dump_super(lfsp)
 		"cleansz  ", lfsp->lfs_cleansz,
 		"segtabsz ", lfsp->lfs_segtabsz);
 
-	(void)printf("%s%lx\t%s%d\t%s%lx\t%s%d\n",
+	(void)printf("%s%x\t%s%d\t%s%x\t%s%d\n",
 		"segmask  ", lfsp->lfs_segmask,
 		"segshift ", lfsp->lfs_segshift,
 		"bmask    ", lfsp->lfs_bmask,
 		"bshift   ", lfsp->lfs_bshift);
 
-	(void)printf("%s%lx\t%s%d\t%s%lx\t%s%d\n",
+	(void)printf("%s%x\t%s%d\t%s%x\t%s%d\n",
 		"ffmask   ", lfsp->lfs_ffmask,
 		"ffshift  ", lfsp->lfs_ffshift,
 		"fbmask   ", lfsp->lfs_fbmask,
 		"fbshift  ", lfsp->lfs_fbshift);
 
-	(void)printf("%s%d\t%s%d\t%s%lx\t%s%qx\n", 
+	(void)printf("%s%d\t%s%d\t%s%x\t%s%qx\n",
 		"sushift  ", lfsp->lfs_sushift,
 		"fsbtodb  ", lfsp->lfs_fsbtodb,
 		"cksum    ", lfsp->lfs_cksum,
@@ -97,22 +97,22 @@ lfs_dump_super(lfsp)
 
 	(void)printf("Superblock disk addresses:");
 	for (i = 0; i < LFS_MAXNUMSB; i++)
-		(void)printf(" %lx", lfsp->lfs_sboffs[i]);
+		(void)printf(" %x", lfsp->lfs_sboffs[i]);
 	(void)printf("\n");
 
 	(void)printf("Checkpoint Info\n");
-	(void)printf("%s%d\t%s%lx\t%s%d\n",
+	(void)printf("%s%d\t%s%x\t%s%d\n",
 		"free     ", lfsp->lfs_free,
 		"idaddr   ", lfsp->lfs_idaddr,
 		"ifile    ", lfsp->lfs_ifile);
-	(void)printf("%s%lx\t%s%d\t%s%lx\t%s%lx\t%s%lx\t%s%lx\n",
+	(void)printf("%s%x\t%s%d\t%s%x\t%s%x\t%s%x\t%s%x\n",
 		"bfree    ", lfsp->lfs_bfree,
 		"nfiles   ", lfsp->lfs_nfiles,
 		"lastseg  ", lfsp->lfs_lastseg,
 		"nextseg  ", lfsp->lfs_nextseg,
 		"curseg   ", lfsp->lfs_curseg,
 		"offset   ", lfsp->lfs_offset);
-	(void)printf("tstamp   %lx\n", lfsp->lfs_tstamp);
+	(void)printf("tstamp   %x\n", lfsp->lfs_tstamp);
 }
 
 void
@@ -127,15 +127,15 @@ lfs_dump_dinode(dip)
 		"uid   ", dip->di_uid,
 		"gid   ", dip->di_gid,
 		"size  ", dip->di_size);
-	(void)printf("inum  %ld\n", dip->di_inumber);
+	(void)printf("inum  %d\n", dip->di_inumber);
 	(void)printf("Direct Addresses\n");
 	for (i = 0; i < NDADDR; i++) {
-		(void)printf("\t%lx", dip->di_db[i]);
+		(void)printf("\t%x", dip->di_db[i]);
 		if ((i % 6) == 5)
 			(void)printf("\n");
 	}
 	for (i = 0; i < NIADDR; i++)
-		(void)printf("\t%lx", dip->di_ib[i]);
+		(void)printf("\t%x", dip->di_ib[i]);
 	(void)printf("\n");
 }
 #endif /* DEBUG */
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 35374b85538..b0cd531d1a0 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: lfs_vfsops.c,v 1.2 1996/02/27 07:13:29 niklas Exp $	*/
-/*	$NetBSD: lfs_vfsops.c,v 1.10 1996/02/09 22:28:58 christos Exp $	*/
+/*	$OpenBSD: lfs_vfsops.c,v 1.3 1996/04/21 22:32:45 deraadt Exp $	*/
+/*	$NetBSD: lfs_vfsops.c,v 1.11 1996/03/25 12:53:35 pk Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -350,7 +350,7 @@ lfs_unmount(mp, mntflags, p)
 {
 	register struct ufsmount *ump;
 	register struct lfs *fs;
-	int i, error, flags, ronly;
+	int error, flags, ronly;
 
 	flags = 0;
 	if (mntflags & MNT_FORCE)
@@ -360,6 +360,7 @@ lfs_unmount(mp, mntflags, p)
 	fs = ump->um_lfs;
 #ifdef QUOTA
 	if (mp->mnt_flag & MNT_QUOTA) {
+		int i;
 		error = vflush(mp, fs->lfs_ivnode, SKIPSYSTEM|flags);
 		if (error)
 			return (error);
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index 3cc2864e160..63b20a029bf 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: mfs_vnops.c,v 1.3 1996/04/19 16:10:41 niklas Exp $	*/
-/*	$NetBSD: mfs_vnops.c,v 1.7 1996/02/21 00:06:45 cgd Exp $	*/
+/*	$OpenBSD: mfs_vnops.c,v 1.4 1996/04/21 22:32:49 deraadt Exp $	*/
+/*	$NetBSD: mfs_vnops.c,v 1.8 1996/03/17 02:16:32 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -298,7 +298,7 @@ mfs_inactive(v)
 	register struct mfsnode *mfsp = VTOMFS(ap->a_vp);
 
 	if (mfsp->mfs_buflist && mfsp->mfs_buflist != (struct buf *)(-1))
-		panic("mfs_inactive: not inactive (mfs_buflist %x)",
+		panic("mfs_inactive: not inactive (mfs_buflist %p)",
 			mfsp->mfs_buflist);
 	return (0);
 }
@@ -332,8 +332,8 @@ mfs_print(v)
 	} */ *ap = v;
 	register struct mfsnode *mfsp = VTOMFS(ap->a_vp);
 
-	printf("tag VT_MFS, pid %d, base %p, size %d\n", mfsp->mfs_pid,
-		mfsp->mfs_baseoff, mfsp->mfs_size);
+	printf("tag VT_MFS, pid %d, base %p, size %ld\n", mfsp->mfs_pid,
+	    mfsp->mfs_baseoff, mfsp->mfs_size);
 	return (0);
 }