svn commit: r320569 - in stable/11/usr.sbin: ifmcstat ip6addrctl

[Marcelo Araujo]

Author: araujo
Date: Sun Jul  2 04:22:37 2017
New Revision: 320569
URL: https://svnweb.freebsd.org/changeset/base/320569

Log:
  MFC r319969-r319970
  
  r319969:
  Use nitems() from sys/param.h.
  
  r319970:
  Use nitems() from sys/param.h.

Modified:
  stable/11/usr.sbin/ifmcstat/ifmcstat.c
  stable/11/usr.sbin/ip6addrctl/ip6addrctl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/ifmcstat/ifmcstat.c
==============================================================================
--- stable/11/usr.sbin/ifmcstat/ifmcstat.c	Sun Jul  2 04:19:03 2017	(r320568)
+++ stable/11/usr.sbin/ifmcstat/ifmcstat.c	Sun Jul  2 04:22:37 2017	(r320569)
@@ -805,7 +805,7 @@ inm_print_sources_sysctl(uint32_t ifindex, struct in_a
 	uint32_t fmode;
 	const char *modestr;
 
-	mibsize = sizeof(mib) / sizeof(mib[0]);
+	mibsize = nitems(mib);
 	if (sysctlnametomib("net.inet.ip.mcast.filters", mib, &mibsize) == -1) {
 		perror("sysctlnametomib");
 		return;
@@ -814,7 +814,7 @@ inm_print_sources_sysctl(uint32_t ifindex, struct in_a
 	needed = 0;
 	mib[5] = ifindex;
 	mib[6] = gina.s_addr;	/* 32 bits wide */
-	mibsize = sizeof(mib) / sizeof(mib[0]);
+	mibsize = nitems(mib);
 	do {
 		if (sysctl(mib, mibsize, NULL, &needed, NULL, 0) == -1) {
 			perror("sysctl net.inet.ip.mcast.filters");
@@ -905,7 +905,7 @@ in6m_print_sources_sysctl(uint32_t ifindex, struct in6
 	uint32_t fmode;
 	const char *modestr;
 
-	mibsize = sizeof(mib) / sizeof(mib[0]);
+	mibsize = nitems(mib);
 	if (sysctlnametomib("net.inet6.ip6.mcast.filters", mib,
 	    &mibsize) == -1) {
 		perror("sysctlnametomib");
@@ -918,7 +918,7 @@ in6m_print_sources_sysctl(uint32_t ifindex, struct in6
 	for (i = 0; i < 4; i++)
 		mib[6 + i] = *pi++;
 
-	mibsize = sizeof(mib) / sizeof(mib[0]);
+	mibsize = nitems(mib);
 	do {
 		if (sysctl(mib, mibsize, NULL, &needed, NULL, 0) == -1) {
 			perror("sysctl net.inet6.ip6.mcast.filters");
@@ -1145,7 +1145,7 @@ ifmcstat_getifmaddrs(void)
 				size_t mibsize, len;
 				int mib[5];
 
-				mibsize = sizeof(mib) / sizeof(mib[0]);
+				mibsize = nitems(mib);
 				if (sysctlnametomib("net.inet.igmp.ifinfo",
 				    mib, &mibsize) == -1) {
 					perror("sysctlnametomib");
@@ -1170,7 +1170,7 @@ ifmcstat_getifmaddrs(void)
 				size_t mibsize, len;
 				int mib[5];
 
-				mibsize = sizeof(mib) / sizeof(mib[0]);
+				mibsize = nitems(mib);
 				if (sysctlnametomib("net.inet6.mld.ifinfo",
 				    mib, &mibsize) == -1) {
 					perror("sysctlnametomib");

Modified: stable/11/usr.sbin/ip6addrctl/ip6addrctl.c
==============================================================================
--- stable/11/usr.sbin/ip6addrctl/ip6addrctl.c	Sun Jul  2 04:19:03 2017	(r320568)
+++ stable/11/usr.sbin/ip6addrctl/ip6addrctl.c	Sun Jul  2 04:22:37 2017	(r320569)
@@ -111,7 +111,7 @@ get_policy(void)
 	struct in6_addrpolicy *buf;
 	struct in6_addrpolicy *pol, *ep;
 
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) {
+	if (sysctl(mib, nitems(mib), NULL, &l, NULL, 0) < 0) {
 		err(1, "sysctl(IPV6CTL_ADDRCTLPOLICY)");
 		/* NOTREACHED */
 	}
@@ -123,7 +123,7 @@ get_policy(void)
 		errx(1, "malloc failed");
 		/* NOTREACHED */
 	}
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
+	if (sysctl(mib, nitems(mib), buf, &l, NULL, 0) < 0) {
 		err(1, "sysctl(IPV6CTL_ADDRCTLPOLICY)");
 		/* NOTREACHED */
 	}