diff options
Diffstat (limited to 'sbin/fsck_ffs')
-rw-r--r-- | sbin/fsck_ffs/dir.c | 4 | ||||
-rw-r--r-- | sbin/fsck_ffs/fsck.h | 6 | ||||
-rw-r--r-- | sbin/fsck_ffs/inode.c | 2 | ||||
-rw-r--r-- | sbin/fsck_ffs/main.c | 4 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass1.c | 2 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass2.c | 2 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass5.c | 2 | ||||
-rw-r--r-- | sbin/fsck_ffs/preen.c | 2 | ||||
-rw-r--r-- | sbin/fsck_ffs/setup.c | 8 |
9 files changed, 16 insertions, 16 deletions
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index ead9a5f..888bad2 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -149,7 +149,7 @@ dirscan(idesc) dirty(bp); sbdirty(); } - if (n & STOP) + if (n & STOP) return (n); } return (idesc->id_filesize > 0 ? KEEPON : STOP); @@ -512,7 +512,7 @@ makeentry(parent, ino, name) struct dinode *dp; struct inodesc idesc; char pathbuf[MAXPATHLEN + 1]; - + if (parent < ROOTINO || parent >= maxino || ino < ROOTINO || ino >= maxino) return (0); diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index f38715d..24037b6 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -112,14 +112,14 @@ struct inodesc { /* * Linked list of duplicate blocks. - * + * * The list is composed of two parts. The first part of the * list (from duplist through the node pointed to by muldup) - * contains a single copy of each duplicate block that has been + * contains a single copy of each duplicate block that has been * found. The second part of the list (from muldup to the end) * contains duplicate blocks that have been found more than once. * To check if a block has been found as a duplicate it is only - * necessary to search from duplist through muldup. To find the + * necessary to search from duplist through muldup. To find the * total number of times that a block has been found as a duplicate * the entire list must be searched for occurences of the block * in question. The following diagram shows a sample list where diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 22cee3f..aa47fb8 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -374,7 +374,7 @@ inocleanup() free((char *)inpsort); inphead = inpsort = NULL; } - + void inodirty() { diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 1a6cd44..ddf1892 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -84,7 +84,7 @@ main(argc, argv) case 'c': cvtlevel = argtoi('c', "conversion level", optarg, 10); break; - + case 'd': debug++; break; @@ -296,7 +296,7 @@ checkfilesys(filesys, mntpt, auxdata, child) sbdirty(); } if (cvtlevel && sblk.b_dirty) { - /* + /* * Write out the duplicate super blocks */ for (cylno = 0; cylno < sblock.fs_ncg; cylno++) diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 70ce40a..3fec63a 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 1980, 1986, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index 82cbe0a..382207e 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -211,7 +211,7 @@ pass2check(idesc) dirp->d_type = typemap[dirp->d_ino]; ret |= ALTERED; } - /* + /* * check for "." */ if (idesc->id_entryno != 0) diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 7972468..eae5d7e 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -117,7 +117,7 @@ pass5() &newcg->cg_space[0] - (u_char *)(&newcg->cg_link); newcg->cg_boff = newcg->cg_btotoff + fs->fs_cpg * sizeof(long); - newcg->cg_iusedoff = newcg->cg_boff + + newcg->cg_iusedoff = newcg->cg_boff + fs->fs_cpg * fs->fs_nrpos * sizeof(short); newcg->cg_freeoff = newcg->cg_iusedoff + howmany(fs->fs_ipg, NBBY); diff --git a/sbin/fsck_ffs/preen.c b/sbin/fsck_ffs/preen.c index 1cdb01d..413e4d4 100644 --- a/sbin/fsck_ffs/preen.c +++ b/sbin/fsck_ffs/preen.c @@ -121,7 +121,7 @@ checkfstab(preen, maxrun, docheck, chkit) maxrun = ndisks; nextdisk = disks; for (passno = 0; passno < maxrun; ++passno) { - while ((ret = startdisk(nextdisk, chkit)) != 0 && + while ((ret = startdisk(nextdisk, chkit)) != 0 && nrun > 0) sleep(10); if (ret) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index fe6f2ea..5fb5697 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -157,7 +157,7 @@ setup(dev) sbdirty(); } } - if (sblock.fs_interleave < 1 || + if (sblock.fs_interleave < 1 || sblock.fs_interleave > sblock.fs_nsect) { pwarn("IMPOSSIBLE INTERLEAVE=%d IN SUPERBLOCK", sblock.fs_interleave); @@ -169,7 +169,7 @@ setup(dev) dirty(&asblk); } } - if (sblock.fs_npsect < sblock.fs_nsect || + if (sblock.fs_npsect < sblock.fs_nsect || sblock.fs_npsect > sblock.fs_nsect*2) { pwarn("IMPOSSIBLE NPSECT=%d IN SUPERBLOCK", sblock.fs_npsect); @@ -277,7 +277,7 @@ setup(dev) } lncntp = (short *)calloc((unsigned)(maxino + 1), sizeof(short)); if (lncntp == NULL) { - printf("cannot alloc %u bytes for lncntp\n", + printf("cannot alloc %u bytes for lncntp\n", (unsigned)(maxino + 1) * sizeof(short)); goto badsb; } @@ -289,7 +289,7 @@ setup(dev) inphead = (struct inoinfo **)calloc((unsigned)numdirs, sizeof(struct inoinfo *)); if (inpsort == NULL || inphead == NULL) { - printf("cannot alloc %u bytes for inphead\n", + printf("cannot alloc %u bytes for inphead\n", (unsigned)numdirs * sizeof(struct inoinfo *)); goto badsb; } |