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/ncheck_ffs | |
| 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/ncheck_ffs')
| -rw-r--r-- | sbin/ncheck_ffs/ncheck_ffs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c index 7029d405212..c0b7e08aafb 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.36 2013/04/24 13:46:29 deraadt Exp $ */ +/* $OpenBSD: ncheck_ffs.c,v 1.37 2013/06/11 16:42:05 deraadt Exp $ */ /*- * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -104,11 +104,11 @@ int nicache; void addinode(ino_t inum); void *getino(ino_t inum); void findinodes(ino_t); -void bread(daddr64_t, char *, int); +void bread(daddr_t, char *, int); __dead void usage(void); void scanonedir(ino_t, const char *); -void dirindir(ino_t, daddr64_t, int, off_t, const char *); -void searchdir(ino_t, daddr64_t, long, off_t, const char *); +void dirindir(ino_t, daddr_t, int, off_t, const char *); +void searchdir(ino_t, daddr_t, long, off_t, const char *); int matchino(const void *, const void *); int matchcache(const void *, const void *); void cacheino(ino_t, void *); @@ -228,7 +228,7 @@ void * getino(ino_t inum) { static char *itab = NULL; - static daddr64_t iblk = -1; + static daddr_t iblk = -1; void *dp; size_t dsize; @@ -261,7 +261,7 @@ int breaderrors = 0; #define BREADEMAX 32 void -bread(daddr64_t blkno, char *buf, int size) +bread(daddr_t blkno, char *buf, int size) { int cnt, i; @@ -364,7 +364,7 @@ scanonedir(ino_t ino, const char *path) * require the directory to be dumped. */ void -dirindir(ino_t ino, daddr64_t blkno, int ind_level, off_t filesize, +dirindir(ino_t ino, daddr_t blkno, int ind_level, off_t filesize, const char *path) { int i; @@ -402,7 +402,7 @@ dirindir(ino_t ino, daddr64_t blkno, int ind_level, off_t filesize, * contains any subdirectories. */ void -searchdir(ino_t ino, daddr64_t blkno, long size, off_t filesize, +searchdir(ino_t ino, daddr_t blkno, long size, off_t filesize, const char *path) { char *dblk; |