Author: dim
Date: Fri Mar 23 11:01:04 2012
New Revision: 233351
URL: http://svn.freebsd.org/changeset/base/233351
Log:
MFC r232749:
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.
Modified:
stable/9/sbin/fsdb/Makefile
stable/9/sbin/fsdb/fsdbutil.c
Directory Properties:
stable/9/sbin/fsdb/ (props changed)
Modified: stable/9/sbin/fsdb/Makefile
==============================================================================
--- stable/9/sbin/fsdb/Makefile Fri Mar 23 10:58:35 2012 (r233350)
+++ stable/9/sbin/fsdb/Makefile Fri Mar 23 11:01:04 2012 (r233351)
@@ -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
Modified: stable/9/sbin/fsdb/fsdbutil.c
==============================================================================
--- stable/9/sbin/fsdb/fsdbutil.c Fri Mar 23 10:58:35 2012 (r233350)
+++ stable/9/sbin/fsdb/fsdbutil.c Fri Mar 23 11:01:04 2012 (r233351)
@@ -195,7 +195,7 @@ printstat(const char *cp, ino_t inum, un
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);
}