diff options
| author | dim <dim@FreeBSD.org> | 2012-03-09 21:02:39 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-03-09 21:02:39 +0000 |
| commit | 29139aa04089c8746c4b5a4dbc5061d8cb4670db (patch) | |
| tree | 01a969e8f3f53d3100c58f821c62815b50284d0a /sbin/fsdb | |
| parent | d692d62069a3260289bed79af40dc1c910af8ca3 (diff) | |
| download | FreeBSD-src-29139aa04089c8746c4b5a4dbc5061d8cb4670db.zip FreeBSD-src-29139aa04089c8746c4b5a4dbc5061d8cb4670db.tar.gz | |
Partially undo r228693, by removing NO_WFORMAT.clang in fsdb's Makefile,
and fixing the format string in sbin/fsdb/fsdbutil.c instead.
Note the remark "Work around a problem with format string warnings and
ntohs macros" was actually incorrect. The DIP(dp, di_nlink) macro
invocation actually returned an int, due to its ternary expression, even
though the di_nlink members of struct ufs1_dinode and struct ufs2_dinode
are both defined as int16_t.
MFC after: 2 weeks
Diffstat (limited to 'sbin/fsdb')
| -rw-r--r-- | sbin/fsdb/Makefile | 2 | ||||
| -rw-r--r-- | sbin/fsdb/fsdbutil.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index 5e172fd..65333ef 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -9,8 +9,6 @@ SRCS= fsdb.c fsdbutil.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c CFLAGS+= -I${.CURDIR}/../fsck_ffs WARNS?= 2 -# Work around a problem with format string warnings and ntohs macros. -NO_WFORMAT.clang= LDADD= -ledit -ltermcap DPADD= ${LIBEDIT} ${LIBTERMCAP} .PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c index f434677..5d6f16d 100644 --- a/sbin/fsdb/fsdbutil.c +++ b/sbin/fsdb/fsdbutil.c @@ -193,7 +193,7 @@ 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=%jx GEN=%jx\n", DIP(dp, di_nlink), + printf("LINKCNT=%d FLAGS=%#x BLKCNT=%jx GEN=%jx\n", DIP(dp, di_nlink), DIP(dp, di_flags), (intmax_t)blocks, (intmax_t)gen); } |
