Author: mdf
Date: Fri Sep 28 17:34:34 2012
New Revision: 241035
URL: http://svn.freebsd.org/changeset/base/241035
Log:
Fix some nearby type and style errors.
Pointed out by: bde
Modified:
head/sbin/fsck_ffs/main.c
head/sbin/fsck_ffs/pass1.c
head/sbin/fsck_ffs/suj.c
Modified: head/sbin/fsck_ffs/main.c
==============================================================================
--- head/sbin/fsck_ffs/main.c Fri Sep 28 16:23:01 2012 (r241034)
+++ head/sbin/fsck_ffs/main.c Fri Sep 28 17:34:34 2012 (r241035)
@@ -210,12 +210,11 @@ checkfilesys(char *filesys)
struct statfs *mntp;
struct stat snapdir;
struct group *grp;
- ufs2_daddr_t blks;
struct iovec *iov;
char errmsg[255];
int iovlen;
int cylno;
- ino_t files;
+ intmax_t blks, files;
size_t size;
iov = NULL;
@@ -382,9 +381,9 @@ checkfilesys(char *filesys)
clean:
pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree +
sblock.fs_frag * sblock.fs_cstotal.cs_nbfree));
- printf("(%lld frags, %lld blocks, %.1f%% fragmentation)\n",
- (long long)sblock.fs_cstotal.cs_nffree,
- (long long)sblock.fs_cstotal.cs_nbfree,
+ printf("(%jd frags, %jd blocks, %.1f%% fragmentation)\n",
+ (intmax_t)sblock.fs_cstotal.cs_nffree,
+ (intmax_t)sblock.fs_cstotal.cs_nbfree,
sblock.fs_cstotal.cs_nffree * 100.0 / sblock.fs_dsize);
return (0);
}
@@ -481,8 +480,8 @@ checkfilesys(char *filesys)
blks = maxfsblock - (n_ffree + sblock.fs_frag * n_bfree) - blks;
if (bkgrdflag && (files > 0 || blks > 0)) {
countdirs = sblock.fs_cstotal.cs_ndir - countdirs;
- pwarn("Reclaimed: %ld directories, %ld files, %lld fragments\n",
- countdirs, (long)files - countdirs, (long long)blks);
+ pwarn("Reclaimed: %ld directories, %jd files, %jd fragments\n",
+ countdirs, files - countdirs, blks);
}
pwarn("%ld files, %jd used, %ju free ",
(long)n_files, (intmax_t)n_blks,
@@ -492,13 +491,13 @@ checkfilesys(char *filesys)
n_ffree * 100.0 / sblock.fs_dsize);
if (debug) {
if (files < 0)
- printf("%jd inodes missing\n", (intmax_t)-files);
+ printf("%jd inodes missing\n", -files);
if (blks < 0)
- printf("%lld blocks missing\n", -(long long)blks);
+ printf("%jd blocks missing\n", -blks);
if (duplist != NULL) {
printf("The following duplicate blocks remain:");
for (dp = duplist; dp; dp = dp->next)
- printf(" %lld,", (long long)dp->dup);
+ printf(" %jd,", (intmax_t)dp->dup);
printf("\n");
}
}
Modified: head/sbin/fsck_ffs/pass1.c
==============================================================================
--- head/sbin/fsck_ffs/pass1.c Fri Sep 28 16:23:01 2012 (r241034)
+++ head/sbin/fsck_ffs/pass1.c Fri Sep 28 17:34:34 2012 (r241035)
@@ -99,11 +99,10 @@ pass1(void)
if (!rebuildcg && sblock.fs_magic == FS_UFS2_MAGIC) {
inosused = cgrp.cg_initediblk;
if (inosused > sblock.fs_ipg) {
- pfatal("%s (%ju > %d) %s %d\nReset to %d\n",
- "Too many initialized inodes",
+ pfatal(
+"Too many initialized inodes (%ju > %d) in cylinder group %d\nReset to %d\n",
(uintmax_t)inosused,
- sblock.fs_ipg, "in cylinder group", c,
- sblock.fs_ipg);
+ sblock.fs_ipg, c, sblock.fs_ipg);
inosused = sblock.fs_ipg;
}
} else {
Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c Fri Sep 28 16:23:01 2012 (r241034)
+++ head/sbin/fsck_ffs/suj.c Fri Sep 28 17:34:34 2012 (r241035)
@@ -1401,9 +1401,8 @@ ino_adjust(struct suj_ino *sino)
ip = ino_read(ino);
mode = DIP(ip, di_mode) & IFMT;
if (nlink > LINK_MAX)
- err_suj("ino %ju %s, new link %d, old link %d\n",
- (uintmax_t)ino, "nlink manipulation error", nlink,
- DIP(ip, di_nlink));
+ err_suj("ino %ju nlink manipulation error, new %d, old %d\n",
+ (uintmax_t)ino, nlink, DIP(ip, di_nlink));
if (debug)
printf("Adjusting ino %ju, nlink %d, old link %d lastmode %o\n",
(uintmax_t)ino, nlink, DIP(ip, di_nlink), sino->si_mode);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
