From owner-svn-src-all@FreeBSD.ORG  Sun Dec 18 17:42:27 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 426991065680;
	Sun, 18 Dec 2011 17:42:27 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 316EE8FC18;
	Sun, 18 Dec 2011 17:42:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBIHgQ8E019061;
	Sun, 18 Dec 2011 17:42:26 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBIHgQeW019058;
	Sun, 18 Dec 2011 17:42:26 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112181742.pBIHgQeW019058@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 18 Dec 2011 17:42:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228693 - head/sbin/fsdb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Dec 2011 17:42:27 -0000

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);
 }