From owner-svn-src-stable-10@freebsd.org  Thu Feb  9 02:08:44 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 443ECCD6B87;
 Thu,  9 Feb 2017 02:08:44 +0000 (UTC) (envelope-from cy@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 10DCD1860;
 Thu,  9 Feb 2017 02:08:43 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1928hx7090431;
 Thu, 9 Feb 2017 02:08:43 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1928htf090430;
 Thu, 9 Feb 2017 02:08:43 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201702090208.v1928htf090430@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 9 Feb 2017 02:08:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r313461 - in stable: 10/contrib/ipfilter/tools
 11/contrib/ipfilter/tools
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Feb 2017 02:08:44 -0000

Author: cy
Date: Thu Feb  9 02:08:42 2017
New Revision: 313461
URL: https://svnweb.freebsd.org/changeset/base/313461

Log:
  MFC r312791:
  
  Use normal KNF cuddling of elses.
  
  Reported by:	bde

Modified:
  stable/10/contrib/ipfilter/tools/ipf.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/contrib/ipfilter/tools/ipf.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/contrib/ipfilter/tools/ipf.c
==============================================================================
--- stable/10/contrib/ipfilter/tools/ipf.c	Thu Feb  9 00:28:03 2017	(r313460)
+++ stable/10/contrib/ipfilter/tools/ipf.c	Thu Feb  9 02:08:42 2017	(r313461)
@@ -408,8 +408,7 @@ static void flushfilter(arg, filter)
 		}
 		closedevice();
 		return;
-	}
-	else if (strchr(arg, 'i') || strchr(arg, 'I'))
+	} else if (strchr(arg, 'i') || strchr(arg, 'I'))
 		fl = FR_INQUE;
 	else if (strchr(arg, 'o') || strchr(arg, 'O'))
 		fl = FR_OUTQUE;