From 75d1ec91dfd1424e8dec2e60a8c15b33f1a4083c Mon Sep 17 00:00:00 2001 From: Lukas Ertl Date: Sat, 3 Apr 2004 17:40:19 +0000 Subject: [PATCH] Make growfs WARNS=6 clean. Approved by: grog (mentor) --- sbin/growfs/Makefile | 2 +- sbin/growfs/debug.c | 20 ++++++------ sbin/growfs/growfs.c | 72 +++++++++++++++++++++++--------------------- 3 files changed, 49 insertions(+), 45 deletions(-) diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile index d6ddfd5c6a2e..21b559682b28 100644 --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -10,7 +10,7 @@ PROG= growfs SRCS= growfs.c MAN= growfs.8 -WARNS?= 0 +WARNS?= 6 .if defined(GFSDBG) SRCS+= debug.c diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c index fac09b718970..d97fae31af88 100644 --- a/sbin/growfs/debug.c +++ b/sbin/growfs/debug.c @@ -49,6 +49,7 @@ static const char rcsid[] = #include #include +#include #include #include @@ -783,10 +784,10 @@ dbg_dump_ufs2_ino(struct fs *sb, const char *comment, struct ufs2_dinode *ino) fprintf(dbg_log, "blocks u_int64_t 0x%08x%08x\n", ((unsigned int *)&(ino->di_blocks))[1], ((unsigned int *)&(ino->di_blocks))[0]); - fprintf(dbg_log, "atime ufs_time_t %10u\n", ino->di_atime); - fprintf(dbg_log, "mtime ufs_time_t %10u\n", ino->di_mtime); - fprintf(dbg_log, "ctime ufs_time_t %10u\n", ino->di_ctime); - fprintf(dbg_log, "birthtime ufs_time_t %10u\n", ino->di_birthtime); + fprintf(dbg_log, "atime ufs_time_t %10jd\n", ino->di_atime); + fprintf(dbg_log, "mtime ufs_time_t %10jd\n", ino->di_mtime); + fprintf(dbg_log, "ctime ufs_time_t %10jd\n", ino->di_ctime); + fprintf(dbg_log, "birthtime ufs_time_t %10jd\n", ino->di_birthtime); fprintf(dbg_log, "mtimensec int32_t 0x%08x\n", ino->di_mtimensec); fprintf(dbg_log, "atimensec int32_t 0x%08x\n", ino->di_atimensec); fprintf(dbg_log, "ctimensec int32_t 0x%08x\n", ino->di_ctimensec); @@ -800,24 +801,24 @@ dbg_dump_ufs2_ino(struct fs *sb, const char *comment, struct ufs2_dinode *ino) remaining_blocks=howmany(ino->di_size, sb->fs_bsize); /* XXX ts - +1? */ for(ictr=0; ictr < MIN(NDADDR, remaining_blocks); ictr++) { - fprintf(dbg_log, "db ufs2_daddr_t[%x] 0x%16x\n", ictr, + fprintf(dbg_log, "db ufs2_daddr_t[%x] 0x%16jx\n", ictr, ino->di_db[ictr]); } remaining_blocks-=NDADDR; if(remaining_blocks>0) { - fprintf(dbg_log, "ib ufs2_daddr_t[0] 0x%16x\n", + fprintf(dbg_log, "ib ufs2_daddr_t[0] 0x%16jx\n", ino->di_ib[0]); } remaining_blocks-=howmany(sb->fs_bsize, sizeof(ufs2_daddr_t)); if(remaining_blocks>0) { - fprintf(dbg_log, "ib ufs2_daddr_t[1] 0x%16x\n", + fprintf(dbg_log, "ib ufs2_daddr_t[1] 0x%16jx\n", ino->di_ib[1]); } #define SQUARE(a) ((a)*(a)) remaining_blocks-=SQUARE(howmany(sb->fs_bsize, sizeof(ufs2_daddr_t))); #undef SQUARE if(remaining_blocks>0) { - fprintf(dbg_log, "ib ufs2_daddr_t[2] 0x%16x\n", + fprintf(dbg_log, "ib ufs2_daddr_t[2] 0x%16jx\n", ino->di_ib[2]); } @@ -835,8 +836,7 @@ dbg_dump_ufs2_ino(struct fs *sb, const char *comment, struct ufs2_dinode *ino) void dbg_dump_iblk(struct fs *sb, const char *comment, char *block, size_t length) { - unsigned int *mem; - int i, j, size; + unsigned int *mem, i, j, size; if(!dbg_log) { return; diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index 04257f3ea447..def63cad47c4 100644 --- a/sbin/growfs/growfs.c +++ b/sbin/growfs/growfs.c @@ -65,6 +65,7 @@ static const char rcsid[] = #include #include #include +#include #include #include #include @@ -107,10 +108,10 @@ union dinode { }; #define DIP(dp, field) \ ((sblock.fs_magic == FS_UFS1_MAGIC) ? \ - (dp)->dp1.field : (dp)->dp2.field) + (uint32_t)(dp)->dp1.field : (dp)->dp2.field) static ufs2_daddr_t inoblk; /* inode block address */ static char inobuf[MAXBSIZE]; /* inode block */ -static int maxino; /* last valid inode */ +ino_t maxino; /* last valid inode */ static int unlabeled; /* unlabeled partition, e.g. vinum volume etc. */ /* @@ -366,8 +367,8 @@ initcg(int cylno, time_t utime, int fso, unsigned int Nflag) { DBG_FUNC("initcg") static caddr_t iobuf; - long i, d, dlower, dupper, blkno, start; - ufs2_daddr_t cbase, dmax; + long d, dlower, dupper, blkno, start; + ufs2_daddr_t i, cbase, dmax; struct ufs1_dinode *dp1; struct ufs2_dinode *dp2; struct csum *cs; @@ -628,9 +629,9 @@ cond_bl_upd(ufs2_daddr_t *block, struct gfs_bpp *field, int fsi, int fso, fragnum = fragnum(&sblock, src); *block = dst + fragnum; f->found++; - DBG_PRINT3("scg (%d->%d)[%d] reference updated\n", - f->old, - f->new, + DBG_PRINT3("scg (%jd->%jd)[%d] reference updated\n", + (intmax_t)f->old, + (intmax_t)f->new, fragnum); /* @@ -751,10 +752,12 @@ updjcg(int cylno, time_t utime, int fsi, int fso, unsigned int Nflag) DBG_PRINT2("jcg dbg: %d %u", cylno, sblock.fs_ncg); +#ifdef FS_DEBUG if (sblock.fs_magic == FS_UFS1_MAGIC) DBG_PRINT2("%d %u", acg.cg_old_ncyl, sblock.fs_old_cpg); +#endif DBG_PRINT0("\n"); acg.cg_ndblk = dmax - cbase; sblock.fs_dsize += acg.cg_ndblk-aocg.cg_ndblk; @@ -1030,8 +1033,8 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag) */ d--; - DBG_PRINT1("d=%d\n", - d); + DBG_PRINT1("d=%jd\n", + (intmax_t)d); if((d+1)%sblock.fs_frag) { /* * The end of the cylinder summary is not a complete @@ -1040,8 +1043,8 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag) DBG_TRC; frag_adjust(d%sblock.fs_fpg, -1); for(; (d+1)%sblock.fs_frag; d--) { - DBG_PRINT1("d=%d\n", - d); + DBG_PRINT1("d=%jd\n", + (intmax_t)d); setbit(cg_blksfree(&acg), d%sblock.fs_fpg); acg.cg_cs.cs_nffree++; sblock.fs_cstotal.cs_nffree++; @@ -1055,7 +1058,7 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag) if(isblock(&sblock, cg_blksfree(&acg), (d%sblock.fs_fpg)/sblock.fs_frag)) { - DBG_PRINT1("d=%d\n", d); + DBG_PRINT1("d=%jd\n", (intmax_t)d); acg.cg_cs.cs_nffree-=sblock.fs_frag; acg.cg_cs.cs_nbfree++; sblock.fs_cstotal.cs_nffree-=sblock.fs_frag; @@ -1080,11 +1083,11 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag) d--; } - DBG_PRINT1("d=%d\n", d); + DBG_PRINT1("d=%jd\n", (intmax_t)d); for(d=rounddown(d, sblock.fs_frag); d >= osblock.fs_csaddr; d-=sblock.fs_frag) { DBG_TRC; - DBG_PRINT1("d=%d\n", d); + DBG_PRINT1("d=%jd\n", (intmax_t)d); setblock(&sblock, cg_blksfree(&acg), (d%sblock.fs_fpg)/sblock.fs_frag); acg.cg_cs.cs_nbfree++; @@ -1256,8 +1259,8 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag) ind=0; frag_adjust(odupper, -1); for(d=odupper; ((d%d) block relocated\n", - bp[i].old, - bp[i].new); + DBG_PRINT2("scg (%jd->%jd) block relocated\n", + (intmax_t)bp[i].old, + (intmax_t)bp[i].new); } /* @@ -1493,8 +1496,8 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag) */ for(i=0; isblock.fs_frag)) { - warnx("error: %d refs found for block %d.", - bp[i].found, bp[i].old); + warnx("error: %jd refs found for block %jd.", + (intmax_t)bp[i].found, (intmax_t)bp[i].old); } } @@ -1539,11 +1542,11 @@ rdfs(ufs2_daddr_t bno, size_t size, void *bf, int fsi) DBG_ENTER; if (lseek(fsi, (off_t)bno * DEV_BSIZE, 0) < 0) { - err(33, "rdfs: seek error: %ld", (long)bno); + err(33, "rdfs: seek error: %jd", (intmax_t)bno); } n = read(fsi, bf, size); if (n != (ssize_t)size) { - err(34, "rdfs: read error: %ld", (long)bno); + err(34, "rdfs: read error: %jd", (intmax_t)bno); } DBG_LEAVE; @@ -2046,6 +2049,7 @@ main(int argc, char **argv) */ cp=device+strlen(device)-1; lp = get_disklabel(fsi); + pp = NULL; if (lp != NULL) { if (isdigit(*cp)) { pp = &lp->d_partitions[2]; @@ -2076,7 +2080,7 @@ main(int argc, char **argv) (osblock.fs_magic == FS_UFS2_MAGIC && osblock.fs_sblockloc == sblock_try[i])) && osblock.fs_bsize <= MAXBSIZE && - osblock.fs_bsize >= sizeof(struct fs)) + osblock.fs_bsize >= (int32_t) sizeof(struct fs)) break; } if (sblock_try[i] == -1) { @@ -2106,8 +2110,8 @@ main(int argc, char **argv) * Are we really growing ? */ if(osblock.fs_size >= sblock.fs_size) { - errx(1, "we are not growing (%d->%d)", osblock.fs_size, - sblock.fs_size); + errx(1, "we are not growing (%jd->%jd)", + (intmax_t)osblock.fs_size, (intmax_t)sblock.fs_size); } @@ -2140,7 +2144,7 @@ main(int argc, char **argv) } } - printf("new file systemsize is: %d frags\n", sblock.fs_size); + printf("new file systemsize is: %jd frags\n", (intmax_t)sblock.fs_size); /* * Try to access our new last block in the file system. Even if we @@ -2182,8 +2186,8 @@ main(int argc, char **argv) sblock.fs_ncg--; if (sblock.fs_magic == FS_UFS1_MAGIC) sblock.fs_old_ncyl = sblock.fs_ncg * sblock.fs_old_cpg; - printf("Warning: %d sector(s) cannot be allocated.\n", - fsbtodb(&sblock, sblock.fs_size % sblock.fs_fpg)); + printf("Warning: %jd sector(s) cannot be allocated.\n", + (intmax_t)fsbtodb(&sblock, sblock.fs_size % sblock.fs_fpg)); sblock.fs_size = sblock.fs_ncg * sblock.fs_fpg; } @@ -2387,7 +2391,7 @@ updrefs(int cg, ino_t in, struct gfs_bpp *bp, int fsi, int fso, unsigned int DBG_LEAVE; return; /* only check DIR, FILE, LINK */ } - if (mode == IFLNK && DIP(ino, di_size) < sblock.fs_maxsymlinklen) { + if (mode == IFLNK && DIP(ino, di_size) < (u_int64_t) sblock.fs_maxsymlinklen) { DBG_LEAVE; return; /* skip short symlinks */ }