From owner-svn-src-stable@freebsd.org  Sat Jan  7 08:58:09 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 017EBCA3830;
 Sat,  7 Jan 2017 08:58:08 +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 B9C441C1E;
 Sat,  7 Jan 2017 08:58:08 +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 v078w7Ju085906;
 Sat, 7 Jan 2017 08:58:07 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v078w7RN085905;
 Sat, 7 Jan 2017 08:58:07 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701070858.v078w7RN085905@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 08:58:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r311600 - stable/11/usr.sbin/bsnmpd/modules/snmp_bridge
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2017 08:58:09 -0000

Author: ngie
Date: Sat Jan  7 08:58:07 2017
New Revision: 311600
URL: https://svnweb.freebsd.org/changeset/base/311600

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

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

Modified: stable/11/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
==============================================================================
--- stable/11/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c	Sat Jan  7 08:54:02 2017	(r311599)
+++ stable/11/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c	Sat Jan  7 08:58:07 2017	(r311600)
@@ -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);