From owner-svn-src-all@freebsd.org  Thu Dec 31 22:52:12 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 B3FF6A57F08;
 Thu, 31 Dec 2015 22:52:12 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7F7871948;
 Thu, 31 Dec 2015 22:52:12 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBVMqBpw079766;
 Thu, 31 Dec 2015 22:52:11 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBVMqBUi079765;
 Thu, 31 Dec 2015 22:52:11 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201512312252.tBVMqBUi079765@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 31 Dec 2015 22:52:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293015 - head/contrib/pf/pflogd
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Dec 2015 22:52:12 -0000

Author: dim
Date: Thu Dec 31 22:52:11 2015
New Revision: 293015
URL: https://svnweb.freebsd.org/changeset/base/293015

Log:
  Merge r293013 from clang380-import branch:
  
  Fix a clang 3.8.0 warning in pflogd.c:
  
  contrib/pf/pflogd/pflogd.c:769:8: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
  			if (!if_exists(interface) == -1) {
  			    ^                     ~~
  
  The if_exists() function does not return -1, and even if it did, it
  would not be the correct way to check.  Just ditch the == -1 instead.
  
  Obtained from:	OpenBSD's pflogd.c 1.49
  MFC after:	3 days

Modified:
  head/contrib/pf/pflogd/pflogd.c
Directory Properties:
  head/   (props changed)
  head/contrib/pf/   (props changed)

Modified: head/contrib/pf/pflogd/pflogd.c
==============================================================================
--- head/contrib/pf/pflogd/pflogd.c	Thu Dec 31 22:48:46 2015	(r293014)
+++ head/contrib/pf/pflogd/pflogd.c	Thu Dec 31 22:52:11 2015	(r293015)
@@ -766,7 +766,7 @@ main(int argc, char **argv)
 		np = pcap_dispatch(hpcap, PCAP_NUM_PKTS,
 		    phandler, (u_char *)dpcap);
 		if (np < 0) {
-			if (!if_exists(interface) == -1) {
+			if (!if_exists(interface)) {
 				logmsg(LOG_NOTICE, "interface %s went away",
 				    interface);
 				ret = -1;