svn commit: r229152 - stable/9/sbin/fsdb

[Dimitry Andric]

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