diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
| commit | 6b46236c83f9aa5b9cd59b466eeba348ee23825a (patch) | |
| tree | ef7eca8601ed03d00b5a9a53b3355f66ed478486 /sbin/fsck_ffs/pass1.c | |
| parent | cc20036a151815396b8c4285e8b3b56f0172f1d5 (diff) | |
final removal of daddr64_t. daddr_t has been 64 bit for a long enough
test period; i think 3 years ago the last bugs fell out.
ok otto beck others
Diffstat (limited to 'sbin/fsck_ffs/pass1.c')
| -rw-r--r-- | sbin/fsck_ffs/pass1.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 574f5ad504f..5fff60cc922 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1.c,v 1.37 2013/04/24 13:46:29 deraadt Exp $ */ +/* $OpenBSD: pass1.c,v 1.38 2013/06/11 16:42:04 deraadt Exp $ */ /* $NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $ */ /* @@ -45,8 +45,8 @@ #include "extern.h" #include "fsutil.h" -static daddr64_t badblk; -static daddr64_t dupblk; +static daddr_t badblk; +static daddr_t dupblk; static void checkinode(ino_t, struct inodesc *); static ino_t info_inumber; @@ -67,7 +67,7 @@ pass1(void) struct inostat *info; int c; struct inodesc idesc; - daddr64_t i, cgd; + daddr_t i, cgd; u_int8_t *cp; /* @@ -216,9 +216,9 @@ checkinode(ino_t inumber, struct inodesc *idesc) dp->dp1.di_mode || dp->dp1.di_size)) || (sblock.fs_magic == FS_UFS2_MAGIC && (memcmp(dp->dp2.di_db, ufs2_zino.di_db, - NDADDR * sizeof(daddr64_t)) || + NDADDR * sizeof(daddr_t)) || memcmp(dp->dp2.di_ib, ufs2_zino.di_ib, - NIADDR * sizeof(daddr64_t)) || + NIADDR * sizeof(daddr_t)) || dp->dp2.di_mode || dp->dp2.di_size))) { pfatal("PARTIALLY ALLOCATED INODE I=%llu", (unsigned long long)inumber); @@ -355,7 +355,7 @@ pass1check(struct inodesc *idesc) { int res = KEEPON; int anyout, nfrags; - daddr64_t blkno = idesc->id_blkno; + daddr_t blkno = idesc->id_blkno; struct dups *dlp; struct dups *new; |