From owner-svn-src-all@freebsd.org  Tue Jul 18 18:33:06 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 4C5FDD9CA0E;
 Tue, 18 Jul 2017 18:33:06 +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 1A3157DF80;
 Tue, 18 Jul 2017 18:33:06 +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 v6IIX5r8085898;
 Tue, 18 Jul 2017 18:33:05 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6IIX59D085897;
 Tue, 18 Jul 2017 18:33:05 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707181833.v6IIX59D085897@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: Tue, 18 Jul 2017 18:33:05 +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: r321151 - stable/10/usr.bin/getconf
X-SVN-Group: stable-10
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: stable/10/usr.bin/getconf
X-SVN-Commit-Revision: 321151
X-SVN-Commit-Repository: base
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: Tue, 18 Jul 2017 18:33:06 -0000

Author: ngie
Date: Tue Jul 18 18:33:05 2017
New Revision: 321151
URL: https://svnweb.freebsd.org/changeset/base/321151

Log:
  MFC r318280:
  
  getconf: use nitems(..) to compute NWORDS instead of hardcoding
  the equivalent macro

Modified:
  stable/10/usr.bin/getconf/fake-gperf.awk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/getconf/fake-gperf.awk
==============================================================================
--- stable/10/usr.bin/getconf/fake-gperf.awk	Tue Jul 18 18:23:56 2017	(r321150)
+++ stable/10/usr.bin/getconf/fake-gperf.awk	Tue Jul 18 18:33:05 2017	(r321151)
@@ -36,7 +36,8 @@ state == 1 { print; next; }
   state = 3;
   print "\t{ NULL, 0, 0 }";
   print "};";
-  print "#define\tNWORDS\t(sizeof(wordlist)/sizeof(wordlist[0]) - 1)";
+  print "#include <sys/param.h>";
+  print "#define\tNWORDS\t(nitems(wordlist) - 1)";
   print "static const struct map *";
   print "in_word_set(const char *word)";
   print "{";