From owner-svn-src-head@freebsd.org  Wed Apr 20 01:05:55 2016
Return-Path: <owner-svn-src-head@freebsd.org>
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 62BCBB14382;
 Wed, 20 Apr 2016 01:05:55 +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 33F841C08;
 Wed, 20 Apr 2016 01:05:55 +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 u3K15sHh021937;
 Wed, 20 Apr 2016 01:05:54 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K15sCP021936;
 Wed, 20 Apr 2016 01:05:54 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201604200105.u3K15sCP021936@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
 araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Wed, 20 Apr 2016 01:05:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298320 - head/sbin/sunlabel
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2016 01:05:55 -0000

Author: araujo
Date: Wed Apr 20 01:05:54 2016
New Revision: 298320
URL: https://svnweb.freebsd.org/changeset/base/298320

Log:
  Use nitems() from sys/param.h.
  
  MFC after:	2 weeks.

Modified:
  head/sbin/sunlabel/sunlabel.c

Modified: head/sbin/sunlabel/sunlabel.c
==============================================================================
--- head/sbin/sunlabel/sunlabel.c	Wed Apr 20 01:03:06 2016	(r298319)
+++ head/sbin/sunlabel/sunlabel.c	Wed Apr 20 01:05:54 2016	(r298320)
@@ -903,7 +903,7 @@ tagname(unsigned int tag)
 	struct tags *tp;
 
 	for (i = 0, tp = knowntags;
-	     i < sizeof(knowntags) / sizeof(struct tags);
+	     i < nitems(knowntags);
 	     i++, tp++)
 		if (tp->id == tag)
 			return (tp->name);
@@ -921,7 +921,7 @@ flagname(unsigned int flag)
 	struct tags *tp;
 
 	for (i = 0, tp = knownflags;
-	     i < sizeof(knownflags) / sizeof(struct tags);
+	     i < nitems(knownflags);
 	     i++, tp++)
 		if (tp->id == flag)
 			return (tp->name);
@@ -940,7 +940,7 @@ parse_tag(struct sun_disklabel *sl, int 
 	unsigned long l;
 
 	for (i = 0, tp = knowntags;
-	     i < sizeof(knowntags) / sizeof(struct tags);
+	     i < nitems(knowntags);
 	     i++, tp++)
 		if (strcmp(tp->name, tag) == 0) {
 			sl->sl_vtoc_map[part].svtoc_tag = (uint16_t)tp->id;
@@ -965,7 +965,7 @@ parse_flag(struct sun_disklabel *sl, int
 	unsigned long l;
 
 	for (i = 0, tp = knownflags;
-	     i < sizeof(knownflags) / sizeof(struct tags);
+	     i < nitems(knownflags);
 	     i++, tp++)
 		if (strcmp(tp->name, flag) == 0) {
 			sl->sl_vtoc_map[part].svtoc_flag = (uint16_t)tp->id;