ufs1_daddr_t cleanup, okay otto@

6 files changed, 25 insertions, 25 deletions

diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index e759aee1493..e9a49e73c2f 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsck.h,v 1.19 2007/06/01 06:41:33 deraadt Exp $	*/
+/*	$OpenBSD: fsck.h,v 1.20 2007/06/01 23:42:35 pedro Exp $	*/
 /*	$NetBSD: fsck.h,v 1.13 1996/10/11 20:15:46 thorpej Exp $	*/
 
 /*
@@ -85,8 +85,8 @@ struct bufarea {
 	int	b_flags;
 	union {
 		char	*b_buf;			/* buffer space */
-		ufs1_daddr_t	*b_indir1;	/* FFS1 indirect block */
-		daddr64_t	*b_indir2;	/* FFS2 indirect block */
+		int32_t	*b_indir1;		/* FFS1 indirect block */
+		int64_t	*b_indir2;		/* FFS2 indirect block */
 		struct	fs *b_fs;		/* super block */
 		struct	cg *b_cg;		/* cylinder group */
 		struct	ufs1_dinode *b_dinode1;	/* FFS1 inode block */
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 78c8f5a0c60..d6a4b85288f 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1.c,v 1.24 2007/06/01 06:41:33 deraadt Exp $	*/
+/*	$OpenBSD: pass1.c,v 1.25 2007/06/01 23:42:35 pedro Exp $	*/
 /*	$NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1.c	8.1 (Berkeley) 6/5/93";
 #else
-static const char rcsid[] = "$OpenBSD: pass1.c,v 1.24 2007/06/01 06:41:33 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: pass1.c,v 1.25 2007/06/01 23:42:35 pedro Exp $";
 #endif
 #endif /* not lint */
 
@@ -132,9 +132,9 @@ checkinode(ino_t inumber, struct inodesc *idesc)
 	if (mode == 0) {
 		if ((sblock.fs_magic == FS_UFS1_MAGIC &&
 		     (memcmp(dp->dp1.di_db, ufs1_zino.di_db,
-			NDADDR * sizeof(ufs1_daddr_t)) ||
+			NDADDR * sizeof(int32_t)) ||
 		      memcmp(dp->dp1.di_ib, ufs1_zino.di_ib,
-			NIADDR * sizeof(ufs1_daddr_t)) ||
+			NIADDR * sizeof(int32_t)) ||
 		      dp->dp1.di_mode || dp->dp1.di_size)) ||
 		    (sblock.fs_magic == FS_UFS2_MAGIC &&
 		     (memcmp(dp->dp2.di_db, ufs2_zino.di_db,
@@ -213,10 +213,10 @@ checkinode(ino_t inumber, struct inodesc *idesc)
 		    (sblock.fs_maxsymlinklen == 0 && DIP(dp, di_blocks) == 0)) {
 			if (sblock.fs_magic == FS_UFS1_MAGIC)
 				ndb = howmany(DIP(dp, di_size),
-				    sizeof(ufs1_daddr_t));
+				    sizeof(int32_t));
 			else
 				ndb = howmany(DIP(dp, di_size),
-				    sizeof(daddr64_t));
+				    sizeof(int64_t));
 			if (ndb > NDADDR) {
 				j = ndb - NDADDR;
 				for (ndb = 1; j > 1; j--)
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 771aecfbb44..23fa7c7e7d3 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.36 2007/06/01 06:41:33 deraadt Exp $	*/
+/*	$OpenBSD: setup.c,v 1.37 2007/06/01 23:42:35 pedro Exp $	*/
 /*	$NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.5 (Berkeley) 11/23/94";
 #else
-static const char rcsid[] = "$OpenBSD: setup.c,v 1.36 2007/06/01 06:41:33 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: setup.c,v 1.37 2007/06/01 23:42:35 pedro Exp $";
 #endif
 #endif /* not lint */
 
@@ -357,9 +357,9 @@ setup(char *dev)
 		}
 	}
 	if (sblock.fs_magic == FS_UFS2_MAGIC)
-		nindir = sblock.fs_bsize / sizeof(daddr64_t);
+		nindir = sblock.fs_bsize / sizeof(int64_t);
 	else
-		nindir = sblock.fs_bsize / sizeof(ufs1_daddr_t);
+		nindir = sblock.fs_bsize / sizeof(int32_t);
 	if (NINDIR(&sblock) != nindir) {
 		pwarn("INCONSISTENT NINDIR=%d\n", NINDIR(&sblock));
 		sblock.fs_nindir = nindir;
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index 73a6cc56e01..6009a50fbb6 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncheck_ffs.c,v 1.29 2007/06/01 06:41:35 deraadt Exp $	*/
+/*	$OpenBSD: ncheck_ffs.c,v 1.30 2007/06/01 23:42:35 pedro Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -55,7 +55,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.29 2007/06/01 06:41:35 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.30 2007/06/01 23:42:35 pedro Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -379,9 +379,9 @@ dirindir(ino_t ino, daddr64_t blkno, int ind_level, off_t filesize,
 	if (ind_level <= 0) {
 		for (i = 0; filesize > 0 && i < NINDIR(sblock); i++) {
 			if (sblock->fs_magic == FS_UFS1_MAGIC)
-				blkno = ((ufs1_daddr_t *)idblk)[i];
+				blkno = ((int32_t *)idblk)[i];
 			else
-				blkno = ((daddr64_t *)idblk)[i];
+				blkno = ((int64_t *)idblk)[i];
 			if (blkno != 0)
 				searchdir(ino, blkno, sblock->fs_bsize,
 				    filesize, path);
@@ -391,9 +391,9 @@ dirindir(ino_t ino, daddr64_t blkno, int ind_level, off_t filesize,
 	ind_level--;
 	for (i = 0; filesize > 0 && i < NINDIR(sblock); i++) {
 		if (sblock->fs_magic == FS_UFS1_MAGIC)
-			blkno = ((ufs1_daddr_t *)idblk)[i];
+			blkno = ((int32_t *)idblk)[i];
 		else
-			blkno = ((daddr64_t *)idblk)[i];
+			blkno = ((int64_t *)idblk)[i];
 		if (blkno != 0)
 			dirindir(ino, blkno, ind_level, filesize, path);
 	}
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 7ad651eb56b..29332c9799c 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs.c,v 1.66 2007/06/01 23:08:23 otto Exp $	*/
+/*	$OpenBSD: mkfs.c,v 1.67 2007/06/01 23:42:35 pedro Exp $	*/
 /*	$NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $	*/
 
 /*
@@ -264,7 +264,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo, mode_t mfsmode,
 	 */
 	if (Oflag <= 1) {
 		sblock.fs_sblockloc = SBLOCK_UFS1;
-		sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs1_daddr_t);
+		sblock.fs_nindir = sblock.fs_bsize / sizeof(int32_t);
 		sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs1_dinode);
 		if (Oflag == 0) {
 			sblock.fs_maxsymlinklen = 0;
@@ -284,7 +284,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo, mode_t mfsmode,
 	} else {
 		sblock.fs_inodefmt = FS_44INODEFMT;
 		sblock.fs_sblockloc = SBLOCK_UFS2;
-		sblock.fs_nindir = sblock.fs_bsize / sizeof(daddr64_t);
+		sblock.fs_nindir = sblock.fs_bsize / sizeof(int64_t);
 		sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode);
 		sblock.fs_maxsymlinklen = MAXSYMLINKLEN_UFS2;
 	}
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 15e6b935c07..90a0b0a6d28 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.66 2007/06/01 06:41:35 deraadt Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.67 2007/06/01 23:42:35 pedro Exp $	*/
 /*	$NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $	*/
 
 /*
@@ -98,8 +98,8 @@ u_short	dkcksum(struct disklabel *);
  * placed in a single cylinder group. The default is one indirect
  * block worth of data blocks.
  */
-#define MAXBLKPG_FFS1(bsize)	((bsize) / sizeof(ufs1_daddr_t))
-#define MAXBLKPG_FFS2(bsize)	((bsize) / sizeof(daddr64_t))
+#define MAXBLKPG_FFS1(bsize)	((bsize) / sizeof(int32_t))
+#define MAXBLKPG_FFS2(bsize)	((bsize) / sizeof(int64_t))
 
 /*
  * Each file system has a number of inodes statically allocated.