diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-07 18:26:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-07 18:26:23 +0000 |
| commit | bca8ede36193523f5e509e218d1976dc9b8386e2 (patch) | |
| tree | 8021052d902e951ea77cf9a839e25b3062a6b5bc /sbin/ncheck_ffs/ncheck_ffs.c | |
| parent | f450dee1afdaa407e9eb35b9d02efd9642a245fa (diff) | |
major -Wall cleanup, almost complete
Diffstat (limited to 'sbin/ncheck_ffs/ncheck_ffs.c')
| -rw-r--r-- | sbin/ncheck_ffs/ncheck_ffs.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c index 7a3596e395c..3ce9159f02a 100644 --- a/sbin/ncheck_ffs/ncheck_ffs.c +++ b/sbin/ncheck_ffs/ncheck_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncheck_ffs.c,v 1.5 1997/01/15 23:41:30 millert Exp $ */ +/* $OpenBSD: ncheck_ffs.c,v 1.6 2001/07/07 18:26:16 deraadt Exp $ */ /*- * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.5 1997/01/15 23:41:30 millert Exp $"; +static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.6 2001/07/07 18:26:16 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -258,12 +258,12 @@ loop: if ((cnt = read(diskfd, buf, (int)dev_bsize)) == dev_bsize) continue; if (cnt == -1) { - warnx("read error from %s: %s: [sector %d]: count=%d\n", - disk, strerror(errno), blkno, dev_bsize); + warnx("read error from %s: %s: [sector %d]: count=%ld\n", + disk, strerror(errno), blkno, dev_bsize); continue; } - warnx("short read error from %s: [sector %d]: count=%d, got=%d\n", - disk, blkno, dev_bsize, cnt); + warnx("short read error from %s: [sector %d]: count=%ld, got=%d\n", + disk, blkno, dev_bsize, cnt); } } @@ -370,7 +370,7 @@ searchdir(ino, blkno, size, filesize, path) for (loc = 0; loc < size;) { dp = (struct direct *)(dblk + loc); if (dp->d_reclen == 0) { - warnx("corrupted directory, inode %lu", ino); + warnx("corrupted directory, inode %lu", (long)ino); break; } loc += dp->d_reclen; @@ -385,8 +385,11 @@ searchdir(ino, blkno, size, filesize, path) mode = di->di_mode & IFMT; if (bsearch(&dp->d_ino, ilist, ninodes, sizeof(*ilist), matchino)) { if (mflag) - printf("mode %-6o uid %-5lu gid %-5lu ino ", di->di_mode, di->di_uid, di->di_gid); - printf("%-7lu %s/%s%s\n", dp->d_ino, path, dp->d_name, mode == IFDIR ? "/." : ""); + printf("mode %-6o uid %-5lu gid %-5lu ino ", + di->di_mode, (unsigned long)di->di_uid, + (unsigned long)di->di_gid); + printf("%-7lu %s/%s%s\n", (unsigned long)dp->d_ino, + path, dp->d_name, mode == IFDIR ? "/." : ""); } if (mode == IFDIR) { if (dp->d_name[0] == '.') { @@ -486,7 +489,7 @@ main(argc, argv) dev_bsize = sblock->fs_fsize / fsbtodb(sblock, 1); dev_bshift = ffs(dev_bsize) - 1; if (dev_bsize != (1 << dev_bshift)) - errx(2, "blocksize (%d) not a power of 2", dev_bsize); + errx(2, "blocksize (%ld) not a power of 2", dev_bsize); findinodes(sblock->fs_ipg * sblock->fs_ncg); printf("%s:\n", disk); scanonedir(ROOTINO, ""); |