aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2011-12-18 17:42:26 +0000
committerDimitry Andric <dim@FreeBSD.org>2011-12-18 17:42:26 +0000
commitcf2cbe345845484f7e66f82075ad6d9f42652f91 (patch)
treedfd8601a538689393bd5d58e432b7ab87a79ed30 /sbin
parent7f106882fe02eed8861e8e9df7ab1e1100283cc0 (diff)
downloadsrc-cf2cbe345845484f7e66f82075ad6d9f42652f91.tar.gz
src-cf2cbe345845484f7e66f82075ad6d9f42652f91.zip
Revert r228603, and add the workaround to sbin/fsdb/Makefile instead.
MFC after: 1 week
Notes
Notes: svn path=/head/; revision=228693
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fsdb/Makefile4
-rw-r--r--sbin/fsdb/fsdbutil.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 65333ef07252..038f82efd18f 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -9,6 +9,10 @@ SRCS= fsdb.c fsdbutil.c \
pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
CFLAGS+= -I${.CURDIR}/../fsck_ffs
WARNS?= 2
+.if ${CC:T:Mclang} == "clang"
+# Work around a problem with format string warnings and ntohs macros.
+NO_WFORMAT=
+.endif
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 102d45c18048..7ed78a7f39ee 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -193,9 +193,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=%jx GEN=%jx\n",
- (short)DIP(dp, di_nlink), DIP(dp, di_flags), (intmax_t)blocks,
- (intmax_t)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);
}