From owner-svn-src-all@freebsd.org  Sat Jan  7 09:11:19 2017
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 73521CA3F9F;
 Sat,  7 Jan 2017 09:11:19 +0000 (UTC)
 (envelope-from ngie@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 44D2C1860;
 Sat,  7 Jan 2017 09:11:19 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v079BIvT093500;
 Sat, 7 Jan 2017 09:11:18 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v079BIWj093499;
 Sat, 7 Jan 2017 09:11:18 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701070911.v079BIWj093499@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 7 Jan 2017 09:11:18 +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: r311604 - stable/10/usr.sbin/bsnmpd/modules/snmp_bridge
X-SVN-Group: stable-10
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.23
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: Sat, 07 Jan 2017 09:11:19 -0000

Author: ngie
Date: Sat Jan  7 09:11:18 2017
New Revision: 311604
URL: https://svnweb.freebsd.org/changeset/base/311604

Log:
  MFC r311291:
  
  bridge_get_pfval: use nitems instead of spelling it out longhand

Modified:
  stable/10/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c	Sat Jan  7 09:09:54 2017	(r311603)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c	Sat Jan  7 09:11:18 2017	(r311604)
@@ -1449,8 +1449,8 @@ static struct {
 int32_t
 bridge_get_pfval(uint8_t which)
 {
-	if (which > sizeof(bridge_pf_sysctl) / sizeof(bridge_pf_sysctl[0])
-	    || which < 1)
+
+	if (which > nitems(bridge_pf_sysctl) || which < 1)
 		return (-1);
 
 	return (bridge_pf_sysctl[which - 1].val);