BSD 4_4_Lite2 release

[unix-history] / usr / src / sbin / fsck / pass1b.c

diff --git a/usr/src/sbin/fsck/pass1b.c b/usr/src/sbin/fsck/pass1b.c
index 27b2dfd..203fb53 100644 (file)
--- a/usr/src/sbin/fsck/pass1b.c
+++ b/usr/src/sbin/fsck/pass1b.c
@@ -32,19 +32,23 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass1b.c   8.1 (Berkeley) 6/5/93";
+static char sccsid[] = "@(#)pass1b.c   8.4 (Berkeley) 4/28/95";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>

+

 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>

+

 #include <string.h>
 #include <string.h>

+

 #include "fsck.h"
 
 #include "fsck.h"
 

-int    pass1bcheck();

 static  struct dups *duphead;
 static  struct dups *duphead;

+static int pass1bcheck __P((struct inodesc *));

 
 

+void

 pass1b()
 {
        register int c, i;
 pass1b()
 {
        register int c, i;


@@ -52,7 +56,7 @@ pass1b()
        struct inodesc idesc;
        ino_t inumber;
 
        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;
        idesc.id_type = ADDR;
        idesc.id_func = pass1bcheck;
        duphead = duplist;


@@ -72,12 +76,13 @@ pass1b()
        }
 }
 
        }
 }
 

+static int

 pass1bcheck(idesc)
        register struct inodesc *idesc;
 {
        register struct dups *dlp;
        int nfrags, res = KEEPON;
 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))
 
        for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
                if (chkrange(blkno, 1))