diff options
Diffstat (limited to 'sbin/fsck_ffs/dir.c')
-rw-r--r-- | sbin/fsck_ffs/dir.c | 79 |
1 files changed, 25 insertions, 54 deletions
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 3599c2e..84c8f02 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -67,20 +67,20 @@ struct odirtemplate odirhead = { 0, DIRBLKSIZ - 12, 2, ".." }; -static int chgino __P((struct inodesc *)); -static int dircheck __P((struct inodesc *, struct direct *)); -static int expanddir __P((struct dinode *dp, char *name)); -static void freedir __P((ino_t ino, ino_t parent)); -static struct direct *fsck_readdir __P((struct inodesc *)); -static struct bufarea *getdirblk __P((ufs_daddr_t blkno, long size)); -static int lftempname __P((char *bufp, ino_t ino)); -static int mkentry __P((struct inodesc *)); +static int chgino(struct inodesc *); +static int dircheck(struct inodesc *, struct direct *); +static int expanddir(struct dinode *dp, char *name); +static void freedir(ino_t ino, ino_t parent); +static struct direct *fsck_readdir(struct inodesc *); +static struct bufarea *getdirblk(ufs_daddr_t blkno, long size); +static int lftempname(char *bufp, ino_t ino); +static int mkentry(struct inodesc *); /* * Propagate connected state through the tree. */ void -propagate() +propagate(void) { struct inoinfo **inpp, *inp; struct inoinfo **inpend; @@ -106,8 +106,7 @@ propagate() * Scan each entry in a directory block. */ int -dirscan(idesc) - struct inodesc *idesc; +dirscan(struct inodesc *idesc) { struct direct *dp; struct bufarea *bp; @@ -170,8 +169,7 @@ dirscan(idesc) * get next entry in a directory. */ static struct direct * -fsck_readdir(idesc) - struct inodesc *idesc; +fsck_readdir(struct inodesc *idesc) { struct direct *dp, *ndp; struct bufarea *bp; @@ -232,9 +230,7 @@ dpok: * This is a superset of the checks made in the kernel. */ static int -dircheck(idesc, dp) - struct inodesc *idesc; - struct direct *dp; +dircheck(struct inodesc *idesc, struct direct *dp) { int size; char *cp; @@ -281,18 +277,14 @@ bad: } void -direrror(ino, errmesg) - ino_t ino; - char *errmesg; +direrror(ino_t ino, char *errmesg) { fileerror(ino, ino, errmesg); } void -fileerror(cwd, ino, errmesg) - ino_t cwd, ino; - char *errmesg; +fileerror(ino_t cwd, ino_t ino, char *errmesg) { struct dinode *dp; char pathbuf[MAXPATHLEN + 1]; @@ -314,9 +306,7 @@ fileerror(cwd, ino, errmesg) } void -adjust(idesc, lcnt) - struct inodesc *idesc; - int lcnt; +adjust(struct inodesc *idesc, int lcnt) { struct dinode *dp; int saveresolved; @@ -384,8 +374,7 @@ adjust(idesc, lcnt) } static int -mkentry(idesc) - struct inodesc *idesc; +mkentry(struct inodesc *idesc) { struct direct *dirp = idesc->id_dirp; struct direct newent; @@ -429,8 +418,7 @@ mkentry(idesc) } static int -chgino(idesc) - struct inodesc *idesc; +chgino(struct inodesc *idesc) { struct direct *dirp = idesc->id_dirp; @@ -445,10 +433,7 @@ chgino(idesc) } int -linkup(orphan, parentdir, name) - ino_t orphan; - ino_t parentdir; - char *name; +linkup(ino_t orphan, ino_t parentdir, char *name) { struct dinode *dp; int lostdir; @@ -567,10 +552,7 @@ linkup(orphan, parentdir, name) * fix an entry in a directory. */ int -changeino(dir, name, newnum) - ino_t dir; - char *name; - ino_t newnum; +changeino(ino_t dir, char *name, ino_t newnum) { struct inodesc idesc; @@ -588,9 +570,7 @@ changeino(dir, name, newnum) * make an entry in a directory */ int -makeentry(parent, ino, name) - ino_t parent, ino; - char *name; +makeentry(ino_t parent, ino_t ino, char *name) { struct dinode *dp; struct inodesc idesc; @@ -624,9 +604,7 @@ makeentry(parent, ino, name) * Attempt to expand the size of a directory */ static int -expanddir(dp, name) - struct dinode *dp; - char *name; +expanddir(struct dinode *dp, char *name) { ufs_daddr_t lastbn, newblk; struct bufarea *bp; @@ -681,9 +659,7 @@ bad: * allocate a new directory */ ino_t -allocdir(parent, request, mode) - ino_t parent, request; - int mode; +allocdir(ino_t parent, ino_t request, int mode) { ino_t ino; char *cp; @@ -742,8 +718,7 @@ allocdir(parent, request, mode) * free a directory inode */ static void -freedir(ino, parent) - ino_t ino, parent; +freedir(ino_t ino, ino_t parent) { struct dinode *dp; @@ -759,9 +734,7 @@ freedir(ino, parent) * generate a temporary name for the lost+found directory. */ static int -lftempname(bufp, ino) - char *bufp; - ino_t ino; +lftempname(char *bufp, ino_t ino) { ino_t in; char *cp; @@ -786,9 +759,7 @@ lftempname(bufp, ino) * Insure that it is held until another is requested. */ static struct bufarea * -getdirblk(blkno, size) - ufs_daddr_t blkno; - long size; +getdirblk(ufs_daddr_t blkno, long size) { if (pdirbp != 0) |