From owner-svn-src-all@FreeBSD.ORG  Sat Dec 17 22:32:01 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 4F542106566C;
	Sat, 17 Dec 2011 22:32:01 +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 3E3518FC16;
	Sat, 17 Dec 2011 22:32:01 +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 pBHMW1Mb079558;
	Sat, 17 Dec 2011 22:32:01 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBHMW1Bd079555;
	Sat, 17 Dec 2011 22:32:01 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112172232.pBHMW1Bd079555@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 17 Dec 2011 22:32:01 +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: r228668 - head/usr.bin/netstat
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, 17 Dec 2011 22:32:01 -0000

Author: dim
Date: Sat Dec 17 22:32:00 2011
New Revision: 228668
URL: http://svn.freebsd.org/changeset/base/228668

Log:
  Revert r228650, and work around the clang false positive with printf
  formats in usr.bin/netstat/atalk.c by conditionally adding NO_WFORMAT to
  the Makefile instead.
  
  MFC after:	1 week

Modified:
  head/usr.bin/netstat/Makefile
  head/usr.bin/netstat/atalk.c

Modified: head/usr.bin/netstat/Makefile
==============================================================================
--- head/usr.bin/netstat/Makefile	Sat Dec 17 22:20:46 2011	(r228667)
+++ head/usr.bin/netstat/Makefile	Sat Dec 17 22:32:00 2011	(r228668)
@@ -8,6 +8,11 @@ SRCS=	if.c inet.c main.c mbuf.c mroute.c
 	unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c
 
 WARNS?=	3
+.if ${CC:T:Mclang} == "clang"
+# XXX: Work around a clang false positive with format string warnings
+# and ntohs macros (see LLVM PR 11313).
+NO_WFORMAT=
+.endif
 CFLAGS+=-fno-strict-aliasing
 
 CFLAGS+=-DIPSEC

Modified: head/usr.bin/netstat/atalk.c
==============================================================================
--- head/usr.bin/netstat/atalk.c	Sat Dec 17 22:20:46 2011	(r228667)
+++ head/usr.bin/netstat/atalk.c	Sat Dec 17 22:32:00 2011	(r228668)
@@ -81,7 +81,7 @@ static	char mybuf[50];
 			return("*");
 		}
 	}
-	sprintf(mybuf,"%hu",(short)ntohs(sat->sat_addr.s_net));
+	sprintf(mybuf,"%hu",ntohs(sat->sat_addr.s_net));
 	return mybuf;
 }