From owner-svn-src-head@freebsd.org Wed Apr 20 00:55:36 2016 Return-Path: Delivered-To: svn-src-head@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 67B85B13DF1; Wed, 20 Apr 2016 00:55:36 +0000 (UTC) (envelope-from araujo@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 3570D1187; Wed, 20 Apr 2016 00:55:36 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3K0tZsJ018639; Wed, 20 Apr 2016 00:55:35 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K0tZs7018638; Wed, 20 Apr 2016 00:55:35 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201604200055.u3K0tZs7018638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Wed, 20 Apr 2016 00:55:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298317 - head/sbin/hastd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2016 00:55:36 -0000 Author: araujo Date: Wed Apr 20 00:55:35 2016 New Revision: 298317 URL: https://svnweb.freebsd.org/changeset/base/298317 Log: Use nitems() from sys/param.h. MFC after: 2 weeks. Modified: head/sbin/hastd/subr.c Modified: head/sbin/hastd/subr.c ============================================================================== --- head/sbin/hastd/subr.c Wed Apr 20 00:50:17 2016 (r298316) +++ head/sbin/hastd/subr.c Wed Apr 20 00:55:35 2016 (r298317) @@ -247,7 +247,7 @@ drop_privs(const struct hast_resource *r "Unable to limit capability rights on local descriptor"); } if (cap_ioctls_limit(res->hr_localfd, geomcmds, - sizeof(geomcmds) / sizeof(geomcmds[0])) == -1) { + nitems(geomcmds)) == -1) { pjdlog_errno(LOG_ERR, "Unable to limit allowed GEOM ioctls"); } @@ -266,7 +266,7 @@ drop_privs(const struct hast_resource *r "Unable to limit capability rights to CAP_IOCTL on ggate descriptor"); } if (cap_ioctls_limit(res->hr_ggatefd, ggatecmds, - sizeof(ggatecmds) / sizeof(ggatecmds[0])) == -1) { + nitems(ggatecmds)) == -1) { pjdlog_errno(LOG_ERR, "Unable to limit allowed ggate ioctls"); }