diff options
| author | bde <bde@FreeBSD.org> | 1997-03-12 16:58:35 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-03-12 16:58:35 +0000 |
| commit | a54018968d85828ef88c44cb6bc3ff37b5ed9449 (patch) | |
| tree | ad30508c3634fe7a9ac6ccea0735bfc58a5ba998 /sbin/fsck_ffs | |
| parent | 3059cc3c4cb8f649bf74ab86de248fa8239335d0 (diff) | |
| download | FreeBSD-src-a54018968d85828ef88c44cb6bc3ff37b5ed9449.zip FreeBSD-src-a54018968d85828ef88c44cb6bc3ff37b5ed9449.tar.gz | |
Finished (?) merging with Lite2: cleaned up #include mess.
Fixed style bugs in FreeBSD changes.
Diffstat (limited to 'sbin/fsck_ffs')
| -rw-r--r-- | sbin/fsck_ffs/pass1.c | 5 | ||||
| -rw-r--r-- | sbin/fsck_ffs/preen.c | 20 |
2 files changed, 11 insertions, 14 deletions
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 0114c5e..2e34a96 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95"; #include <ufs/ufs/dir.h> #include <ufs/ffs/fs.h> -#include <stdio.h> -#include <stdlib.h> #include <err.h> #include <string.h> @@ -168,7 +166,8 @@ checkinode(inumber, idesc) * Fake ndb value so direct/indirect block checks below * will detect any garbage after symlink string. */ - if ((dp->di_size < sblock.fs_maxsymlinklen) || dp->di_blocks == 0) { + if (dp->di_size < sblock.fs_maxsymlinklen || + dp->di_blocks == 0) { ndb = howmany(dp->di_size, sizeof(ufs_daddr_t)); if (ndb > NDADDR) { j = ndb - NDADDR; diff --git a/sbin/fsck_ffs/preen.c b/sbin/fsck_ffs/preen.c index 09b47c3..383467b 100644 --- a/sbin/fsck_ffs/preen.c +++ b/sbin/fsck_ffs/preen.c @@ -38,13 +38,12 @@ static const char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95"; #include <sys/param.h> #include <sys/stat.h> #include <sys/wait.h> + #include <ufs/ufs/dinode.h> + +#include <ctype.h> #include <fstab.h> #include <string.h> -#include <stdio.h> -#include <unistd.h> -#include <stdlib.h> -#include <ctype.h> #include "fsck.h" @@ -124,8 +123,7 @@ checkfstab(preen, maxrun, docheck, chkit) maxrun = ndisks; nextdisk = disks; for (passno = 0; passno < maxrun; ++passno) { - while ((ret = startdisk(nextdisk, chkit)) != 0 && - nrun > 0) + while ((ret = startdisk(nextdisk, chkit)) && nrun > 0) sleep(10); if (ret) return (ret); @@ -164,8 +162,8 @@ checkfstab(preen, maxrun, docheck, chkit) if (nextdisk == NULL) { if (dk->part) { - while ((ret = startdisk(dk, chkit)) != 0 - && nrun > 0) + while ((ret = startdisk(dk, chkit)) && + nrun > 0) sleep(10); if (ret) return (ret); @@ -178,8 +176,8 @@ checkfstab(preen, maxrun, docheck, chkit) nextdisk->pid == 0) break; } - while ((ret = startdisk(nextdisk, chkit)) != 0 - && nrun > 0) + while ((ret = startdisk(nextdisk, chkit)) && + nrun > 0) sleep(10); if (ret) return (ret); @@ -206,7 +204,7 @@ finddisk(name) { register struct disk *dk, **dkp; register char *p; - size_t len = 0; + size_t len; for (len = strlen(name), p = name + len - 1; p >= name; --p) if (isdigit(*p)) { |
