From 3953c473b0ed222dc8bc05706672121b3a00ee55 Mon Sep 17 00:00:00 2001
From: dim <dim@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 31 Dec 2011 20:06:38 +0000
Subject: [PATCH] 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.


git-svn-id: svn://svn.freebsd.org/base/stable/9@229152 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sbin/fsdb/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 65333ef07..038f82efd 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
-- 
2.45.2