svn commit: r228693 - head/sbin/fsdb

[Dimitry Andric]

Author: dim
Date: Sun Dec 18 17:42:26 2011
New Revision: 228693
URL: http://svn.freebsd.org/changeset/base/228693

Log:
  Revert r228603, and add the workaround to sbin/fsdb/Makefile instead.
  
  MFC after:	1 week

Modified:
  head/sbin/fsdb/Makefile
  head/sbin/fsdb/fsdbutil.c

Modified: head/sbin/fsdb/Makefile
==============================================================================
--- head/sbin/fsdb/Makefile	Sun Dec 18 17:22:45 2011	(r228692)
+++ head/sbin/fsdb/Makefile	Sun Dec 18 17:42:26 2011	(r228693)
@@ -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

Modified: head/sbin/fsdb/fsdbutil.c
==============================================================================
--- head/sbin/fsdb/fsdbutil.c	Sun Dec 18 17:22:45 2011	(r228692)
+++ head/sbin/fsdb/fsdbutil.c	Sun Dec 18 17:42:26 2011	(r228693)
@@ -193,9 +193,8 @@ 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",
-	   (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);
 }