From owner-svn-src-head@freebsd.org  Sun Apr 17 22:42:49 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 B73BBB11640;
 Sun, 17 Apr 2016 22:42:49 +0000 (UTC)
 (envelope-from bapt@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 81F8D1486;
 Sun, 17 Apr 2016 22:42:49 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3HMgmBK000850;
 Sun, 17 Apr 2016 22:42:48 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3HMgmBY000849;
 Sun, 17 Apr 2016 22:42:48 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201604172242.u3HMgmBY000849@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 17 Apr 2016 22:42:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298169 - head/usr.bin/locale
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: Sun, 17 Apr 2016 22:42:49 -0000

Author: bapt
Date: Sun Apr 17 22:42:48 2016
New Revision: 298169
URL: https://svnweb.freebsd.org/changeset/base/298169

Log:
  Use the nitems() macro

Modified:
  head/usr.bin/locale/locale.c

Modified: head/usr.bin/locale/locale.c
==============================================================================
--- head/usr.bin/locale/locale.c	Sun Apr 17 21:59:04 2016	(r298168)
+++ head/usr.bin/locale/locale.c	Sun Apr 17 22:42:48 2016	(r298169)
@@ -35,7 +35,9 @@
  *	nl_langinfo(CODESET).
  */
 
+#include <sys/param.h>
 #include <sys/types.h>
+
 #include <dirent.h>
 #include <err.h>
 #include <locale.h>
@@ -79,7 +81,7 @@ struct _lcinfo {
 	{ "LC_MONETARY",	LC_MONETARY },
 	{ "LC_MESSAGES",	LC_MESSAGES }
 };
-#define	NLCINFO (sizeof(lcinfo)/sizeof(lcinfo[0]))
+#define	NLCINFO nitems(lcinfo)
 
 /* ids for values not referenced by nl_langinfo() */
 #define	KW_ZERO			10000
@@ -290,7 +292,7 @@ main(int argc, char *argv[])
 			}
 		} else {
 			uint i;
-			for (i = 0; i < sizeof (kwinfo) / sizeof (struct _kwinfo); i++)
+			for (i = 0; i < nitems(kwinfo); i++)
 				showdetails ((char *)kwinfo [i].name);
 		}
 		exit(0);