From owner-svn-src-stable@FreeBSD.ORG  Fri Mar 23 10:58:36 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 17D131065674;
	Fri, 23 Mar 2012 10:58:36 +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 028C88FC14;
	Fri, 23 Mar 2012 10:58:36 +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 q2NAwZwm071135;
	Fri, 23 Mar 2012 10:58:35 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2NAwZwt071133;
	Fri, 23 Mar 2012 10:58:35 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203231058.q2NAwZwt071133@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 23 Mar 2012 10:58:35 +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: r233350 - stable/9/usr.bin/netstat
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Mar 2012 10:58:36 -0000

Author: dim
Date: Fri Mar 23 10:58:35 2012
New Revision: 233350
URL: http://svn.freebsd.org/changeset/base/233350

Log:
  MFC r232748:
  
  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.

Modified:
  stable/9/usr.bin/netstat/Makefile
Directory Properties:
  stable/9/usr.bin/netstat/   (props changed)

Modified: stable/9/usr.bin/netstat/Makefile
==============================================================================
--- stable/9/usr.bin/netstat/Makefile	Fri Mar 23 10:55:19 2012	(r233349)
+++ stable/9/usr.bin/netstat/Makefile	Fri Mar 23 10:58:35 2012	(r233350)
@@ -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