d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this WARNS=2 clean by

Browse Source 
- #include <timeconv.h> for _time_to_time32 et al
	- use (uintmax_t) and %j
	- remove unused variable 'j' (from PR 39866)

PR:		39866
Submitted by:	Dan Lukes <dan@obluda.cz>
Tested by:	make universe
This commit is contained in:
Johan Karlsson 2003-11-13 19:08:43 +00:00
parent dced4b0c31
commit 8b5e064d28
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sbin/fsdb/Makefile
View File

@ -8,7 +8,6 @@ SRCS= fsdb.c fsdbutil.c \
dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
CFLAGS+= -I${.CURDIR}/../fsck_ffs
WARNS= 0
LDADD+= -ledit -ltermcap
DPADD+= ${LIBEDIT} ${LIBTERMCAP}
.PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs

1
sbin/fsdb/fsdb.c
View File

@ -41,6 +41,7 @@ static const char rcsid[] =
#include <histedit.h>
#include <pwd.h>
#include <string.h>
#include <timeconv.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/dir.h>

16
sbin/fsdb/fsdbutil.c
View File

@ -38,8 +38,10 @@ static const char rcsid[] =
#include <err.h>
#include <grp.h>
#include <pwd.h>
#include <stdint.h>
#include <string.h>
#include <time.h>
#include <timeconv.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
@ -152,8 +154,8 @@ printstat(const char *cp, ino_t inum, union dinode *dp)
puts("fifo");
break;
}
printf("I=%lu MODE=%o SIZE=%qu", (u_long)inum, DIP(dp, di_mode),
DIP(dp, di_size));
printf("I=%lu MODE=%o SIZE=%ju", (u_long)inum, DIP(dp, di_mode),
(uintmax_t)DIP(dp, di_size));
if (sblock.fs_magic == FS_UFS1_MAGIC)
t = _time32_to_time(dp->dp1.di_mtime);
else
@ -187,8 +189,8 @@ printstat(const char *cp, ino_t inum, union dinode *dp)
blocks = DIP(dp, di_blocks);
gen = DIP(dp, di_gen);
printf("LINKCNT=%hd FLAGS=%#x BLKCNT=%qx GEN=%qx\n", DIP(dp, di_nlink),
DIP(dp, di_flags), blocks, gen);
printf("LINKCNT=%hd FLAGS=%#x BLKCNT=%jx GEN=%jx\n", DIP(dp, di_nlink),
DIP(dp, di_flags), (intmax_t)blocks, (intmax_t)gen);
}
@ -248,7 +250,7 @@ printindir(ufs2_daddr_t blk, int level, char *bufp)
putchar('\n');
return 0;
}
j = sprintf(tempbuf, "%qd", blkno);
j = sprintf(tempbuf, "%jd", (intmax_t)blkno);
if (level == 0) {
charssofar += j;
if (charssofar >= cpl - 2) {
@ -279,7 +281,7 @@ static void
printblocks(ino_t inum, union dinode *dp)
{
char *bufp;
int i, j, nfrags;
int i, nfrags;
long ndb, offset;
ufs2_daddr_t blkno;
@ -294,7 +296,7 @@ printblocks(ino_t inum, union dinode *dp)
if (i > 0)
printf(", ");
blkno = DIP(dp, di_db[i]);
printf("%qd", blkno);
printf("%jd", (intmax_t)blkno);
if (--ndb == 0 && (offset = blkoff(&sblock, DIP(dp, di_size))) != 0) {
nfrags = numfrags(&sblock, fragroundup(&sblock, offset));
printf(" (%d frag%s)", nfrags, nfrags > 1? "s": "");