From owner-svn-src-head@FreeBSD.ORG  Fri Mar  9 20:50:16 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57C43106566C;
	Fri,  9 Mar 2012 20:50:16 +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 4425A8FC0C;
	Fri,  9 Mar 2012 20:50:16 +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 q29KoGNN024710;
	Fri, 9 Mar 2012 20:50:16 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q29KoGHI024708;
	Fri, 9 Mar 2012 20:50:16 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203092050.q29KoGHI024708@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 9 Mar 2012 20:50:16 +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: r232748 - head/usr.bin/netstat
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Mar 2012 20:50:16 -0000

Author: dim
Date: Fri Mar  9 20:50:15 2012
New Revision: 232748
URL: http://svn.freebsd.org/changeset/base/232748

Log:
  After r232745, which makes sure __bswap16(), ntohs() and htons() return
  __uint16_t, we can partially undo r228668.
  
  Note the remark "Work around a clang false positive with format string
  warnings and ntohs macros (see LLVM PR 11313)" was actually incorrect.
  
  Before r232745, on some arches, the ntohs() macros did in fact return
  int, not uint16_t, so clang was right in warning about the %hu format
  string.
  
  MFC after:	2 weeks

Modified:
  head/usr.bin/netstat/Makefile

Modified: head/usr.bin/netstat/Makefile
==============================================================================
--- head/usr.bin/netstat/Makefile	Fri Mar  9 20:43:29 2012	(r232747)
+++ head/usr.bin/netstat/Makefile	Fri Mar  9 20:50:15 2012	(r232748)
@@ -8,9 +8,6 @@ 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
-# XXX: Work around a clang false positive with format string warnings
-# and ntohs macros (see LLVM PR 11313).
-NO_WFORMAT.clang=
 CFLAGS+=-fno-strict-aliasing
 
 CFLAGS+=-DIPSEC