diff options
| author | peter <peter@FreeBSD.org> | 1997-03-11 12:20:21 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-03-11 12:20:21 +0000 |
| commit | ac28da2dc002612b2fd129500af8084d63aa8504 (patch) | |
| tree | 8cadfc9709953ec63a6c3fe257fe499055b9f832 /sbin/fsck_ffs/pass1b.c | |
| parent | 683ee3c015f8c8071f4de0e2cd952c8643315c98 (diff) | |
| download | FreeBSD-src-ac28da2dc002612b2fd129500af8084d63aa8504.zip FreeBSD-src-ac28da2dc002612b2fd129500af8084d63aa8504.tar.gz | |
Merge from Lite2. Note that Lite2 has it's own filesystem clean check
skipping code that overrides ours sooner. One should be eliminated,
but for now it works.
Diffstat (limited to 'sbin/fsck_ffs/pass1b.c')
| -rw-r--r-- | sbin/fsck_ffs/pass1b.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index 1450bd8..e5036c7 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -32,18 +32,21 @@ */ #ifndef lint -static const char sccsid[] = "@(#)pass1b.c 8.1 (Berkeley) 6/5/93"; +static const char sccsid[] = "@(#)pass1b.c 8.4 (Berkeley) 4/28/95"; #endif /* not lint */ #include <sys/param.h> #include <sys/time.h> + #include <ufs/ufs/dinode.h> #include <ufs/ffs/fs.h> + #include <string.h> + #include "fsck.h" -int pass1bcheck(); static struct dups *duphead; +static int pass1bcheck __P((struct inodesc *)); void pass1b() @@ -53,7 +56,7 @@ pass1b() struct inodesc idesc; ino_t inumber; - bzero((char *)&idesc, sizeof(struct inodesc)); + memset(&idesc, 0, sizeof(struct inodesc)); idesc.id_type = ADDR; idesc.id_func = pass1bcheck; duphead = duplist; @@ -73,13 +76,13 @@ pass1b() } } -int +static int pass1bcheck(idesc) register struct inodesc *idesc; { register struct dups *dlp; int nfrags, res = KEEPON; - daddr_t blkno = idesc->id_blkno; + ufs_daddr_t blkno = idesc->id_blkno; for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) { if (chkrange(blkno, 1)) |
