From owner-svn-src-all@FreeBSD.ORG  Sat Dec 31 20:06:39 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 69B2A1065673;
	Sat, 31 Dec 2011 20:06:39 +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 535B28FC13;
	Sat, 31 Dec 2011 20:06:39 +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 pBVK6dIq081029;
	Sat, 31 Dec 2011 20:06:39 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVK6dNp081027;
	Sat, 31 Dec 2011 20:06:39 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112312006.pBVK6dNp081027@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 31 Dec 2011 20:06:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229152 - stable/9/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: Sat, 31 Dec 2011 20:06:39 -0000

Author: dim
Date: Sat Dec 31 20:06:38 2011
New Revision: 229152
URL: http://svn.freebsd.org/changeset/base/229152

Log:
  MFC r228603:
  
    In sbin/fsdb/fsdbutil.c, work around a clang false positive with printf
    format warnings and conditional operators.  (See LLVM PR 11313 for more
    information.)
  
  MFC r228693:
  
    Revert r228603, and add the workaround to sbin/fsdb/Makefile instead.

Modified:
  stable/9/sbin/fsdb/Makefile
Directory Properties:
  stable/9/sbin/fsdb/   (props changed)

Modified: stable/9/sbin/fsdb/Makefile
==============================================================================
--- stable/9/sbin/fsdb/Makefile	Sat Dec 31 20:01:40 2011	(r229151)
+++ stable/9/sbin/fsdb/Makefile	Sat Dec 31 20:06:38 2011	(r229152)
@@ -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