From owner-svn-src-all@freebsd.org  Wed Jul  8 23:57:59 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D79D3997940;
 Wed,  8 Jul 2015 23:57:59 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C7B61155A;
 Wed,  8 Jul 2015 23:57:59 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t68NvxMi033087;
 Wed, 8 Jul 2015 23:57:59 GMT (envelope-from pkelsey@FreeBSD.org)
Received: (from pkelsey@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t68Nvx7g033086;
 Wed, 8 Jul 2015 23:57:59 GMT (envelope-from pkelsey@FreeBSD.org)
Message-Id: <201507082357.t68Nvx7g033086@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pkelsey set sender to
 pkelsey@FreeBSD.org using -f
From: Patrick Kelsey <pkelsey@FreeBSD.org>
Date: Wed, 8 Jul 2015 23:57:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285299 - head/contrib/tcpdump
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Wed, 08 Jul 2015 23:57:59 -0000

Author: pkelsey
Date: Wed Jul  8 23:57:58 2015
New Revision: 285299
URL: https://svnweb.freebsd.org/changeset/base/285299

Log:
  MFV r285292:
  
  Merge upstream fix to eliminate build-breaking gcc warnings of no
  importance.
  
  commit: cab33b7a0acba7d2268a23c4383be6167106e549
  
  Update ND_TTEST2 to fix issue 443
  
  Add IS_NOT_NEGATIVE macro.
  Avoid these warnings:
  - comparison of unsigned expression >= 0 is always true [-Wtype-limits],
  - comparison is always true due to limited range of data type [-Wtype-limits].
  
  Reviewed by: adrian
  Approved by: jmallett (mentor)
  MFC after: 1 month

Modified:
  head/contrib/tcpdump/netdissect.h
Directory Properties:
  head/contrib/tcpdump/   (props changed)

Modified: head/contrib/tcpdump/netdissect.h
==============================================================================
--- head/contrib/tcpdump/netdissect.h	Wed Jul  8 23:50:04 2015	(r285298)
+++ head/contrib/tcpdump/netdissect.h	Wed Jul  8 23:57:58 2015	(r285299)
@@ -270,8 +270,11 @@ struct netdissect_options {
  *
  *	http://www.kb.cert.org/vuls/id/162289
  */
+
+#define IS_NOT_NEGATIVE(x) (((x) > 0) || ((x) == 0))
+
 #define ND_TTEST2(var, l) \
-  ((l) >= 0 && \
+  (IS_NOT_NEGATIVE(l) && \
 	((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \
          (uintptr_t)&(var) <= (uintptr_t)ndo->ndo_snapend - (l)))