diff options
Diffstat (limited to 'sbin/fsck_ext2fs')
-rw-r--r-- | sbin/fsck_ext2fs/dir.c | 4 | ||||
-rw-r--r-- | sbin/fsck_ext2fs/fsck.h | 8 | ||||
-rw-r--r-- | sbin/fsck_ext2fs/inode.c | 4 | ||||
-rw-r--r-- | sbin/fsck_ext2fs/pass1.c | 4 | ||||
-rw-r--r-- | sbin/fsck_ext2fs/pass2.c | 6 | ||||
-rw-r--r-- | sbin/fsck_ext2fs/pass5.c | 8 | ||||
-rw-r--r-- | sbin/fsck_ext2fs/setup.c | 8 |
7 files changed, 21 insertions, 21 deletions
diff --git a/sbin/fsck_ext2fs/dir.c b/sbin/fsck_ext2fs/dir.c index 21159556a7e..b1c23d59e73 100644 --- a/sbin/fsck_ext2fs/dir.c +++ b/sbin/fsck_ext2fs/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.7 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: dir.c,v 1.8 2002/06/09 08:13:05 todd Exp $ */ /* $NetBSD: dir.c,v 1.5 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -54,7 +54,7 @@ char *lfname = "lost+found"; int lfmode = 01777; -struct ext2fs_dirtemplate emptydir = { 0, DIRBLKSIZ }; +struct ext2fs_dirtemplate emptydir = { 0, DIRBLKSIZ }; struct ext2fs_dirtemplate dirhead = { 0, 12, 1, EXT2_FT_DIR, ".", 0, DIRBLKSIZ - 12, 2, EXT2_FT_DIR, ".." diff --git a/sbin/fsck_ext2fs/fsck.h b/sbin/fsck_ext2fs/fsck.h index 5b2275adcb0..89794c93d41 100644 --- a/sbin/fsck_ext2fs/fsck.h +++ b/sbin/fsck_ext2fs/fsck.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsck.h,v 1.5 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: fsck.h,v 1.6 2002/06/09 08:13:05 todd Exp $ */ /* $NetBSD: fsck.h,v 1.1 1997/06/11 11:21:47 bouyer Exp $ */ /* @@ -115,14 +115,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_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c index c6e97e2ca5c..d699bd6094b 100644 --- a/sbin/fsck_ext2fs/inode.c +++ b/sbin/fsck_ext2fs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.9 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: inode.c,v 1.10 2002/06/09 08:13:05 todd Exp $ */ /* $NetBSD: inode.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -513,7 +513,7 @@ findino(idesc) if (ino == 0) return (KEEPON); if (strcmp(dirp->e2d_name, idesc->id_name) == 0 && - (ino == EXT2_ROOTINO || ino >= EXT2_FIRSTINO) + (ino == EXT2_ROOTINO || ino >= EXT2_FIRSTINO) && ino <= maxino) { idesc->id_parent = ino; return (STOP|FOUND); diff --git a/sbin/fsck_ext2fs/pass1.c b/sbin/fsck_ext2fs/pass1.c index bd99eabaf0b..1eb0c81ca45 100644 --- a/sbin/fsck_ext2fs/pass1.c +++ b/sbin/fsck_ext2fs/pass1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1.c,v 1.7 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: pass1.c,v 1.8 2002/06/09 08:13:05 todd Exp $ */ /* $NetBSD: pass1.c,v 1.9 2000/01/31 11:40:12 bouyer Exp $ */ /* @@ -133,7 +133,7 @@ checkinode(inumber, idesc) mode_t mode; dp = getnextinode(inumber); - if (inumber < EXT2_FIRSTINO && inumber != EXT2_ROOTINO) + if (inumber < EXT2_FIRSTINO && inumber != EXT2_ROOTINO) return; mode = fs2h16(dp->e2di_mode) & IFMT; diff --git a/sbin/fsck_ext2fs/pass2.c b/sbin/fsck_ext2fs/pass2.c index a2da0883e51..77bdfb54d97 100644 --- a/sbin/fsck_ext2fs/pass2.c +++ b/sbin/fsck_ext2fs/pass2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass2.c,v 1.6 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: pass2.c,v 1.7 2002/06/09 08:13:05 todd Exp $ */ /* $NetBSD: pass2.c,v 1.6 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -203,7 +203,7 @@ pass2check(idesc) char namebuf[MAXPATHLEN + 1]; char pathbuf[MAXPATHLEN + 1]; - /* + /* * check for "." */ if (idesc->id_entryno != 0) @@ -284,7 +284,7 @@ chk1: dirp->e2d_reclen = proto.e2d_reclen; } if (fs2h32(dirp->e2d_ino) != 0 && - dirp->e2d_namlen == 2 && + dirp->e2d_namlen == 2 && strncmp(dirp->e2d_name, "..", 2) == 0) { inp->i_dotdot = fs2h32(dirp->e2d_ino); if (sblock.e2fs.e2fs_rev > E2FS_REV0 && diff --git a/sbin/fsck_ext2fs/pass5.c b/sbin/fsck_ext2fs/pass5.c index f1793dc7331..7849feab27b 100644 --- a/sbin/fsck_ext2fs/pass5.c +++ b/sbin/fsck_ext2fs/pass5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass5.c,v 1.9 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: pass5.c,v 1.10 2002/06/09 08:13:05 todd Exp $ */ /* $NetBSD: pass5.c,v 1.7 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -104,7 +104,7 @@ pass5() memset(&idesc[0], 0, sizeof idesc); for (i = 0; i < 3; i++) { idesc[i].id_type = ADDR; - } + } j = fs->e2fs.e2fs_ipg * c + 1; @@ -143,7 +143,7 @@ pass5() /* fill in unused par of the inode map */ for (i = fs->e2fs.e2fs_ipg / NBBY; i < fs->e2fs_bsize; i++) - ibmap[i] = 0xff; + ibmap[i] = 0xff; dbase = c * sblock.e2fs.e2fs_bpg + sblock.e2fs.e2fs_first_dblock; @@ -233,7 +233,7 @@ pass5() } } -void +void print_bmap(map, size) u_char *map; u_int32_t size; diff --git a/sbin/fsck_ext2fs/setup.c b/sbin/fsck_ext2fs/setup.c index b42913f448a..4dd2a4c1a6e 100644 --- a/sbin/fsck_ext2fs/setup.c +++ b/sbin/fsck_ext2fs/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.8 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: setup.c,v 1.9 2002/06/09 08:13:05 todd Exp $ */ /* $NetBSD: setup.c,v 1.1 1997/06/11 11:22:01 bouyer Exp $ */ /* @@ -221,11 +221,11 @@ setup(dev) if (typemap == NULL) { printf("cannot alloc %u bytes for typemap\n", (unsigned)(maxino + 1)); - goto badsblabel; + goto badsblabel; } lncntp = (int16_t *)calloc((unsigned)(maxino + 1), sizeof(int16_t)); if (lncntp == NULL) { - printf("cannot alloc %u bytes for lncntp\n", + printf("cannot alloc %u bytes for lncntp\n", (unsigned)((maxino + 1) * sizeof(int16_t))); goto badsblabel; } @@ -239,7 +239,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 badsblabel; } |