- Replace N(a)/N(i)/N(T)/LEN(a)/ARRAY_SIZE(a) with nitems()

- Add missing <err.h> for err() and <sys/sysctl.h> for sysctlbyname()
- NULL -> 0 for 5th parameter of sysctlbyname()

Submitted by: Andriy Voskoboinyk <s3erios@gmail com>
Differential Revision: https://reviews.freebsd.org/D3442

4 files changed, 17 insertions, 19 deletions

diff --git a/tools/regression/lib/msun/test-cexp.c b/tools/regression/lib/msun/test-cexp.c
index 69897d3..6be71ad 100644
--- a/tools/regression/lib/msun/test-cexp.c
+++ b/tools/regression/lib/msun/test-cexp.c
@@ -31,6 +31,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/param.h>
+
 #include <assert.h>
 #include <complex.h>
 #include <fenv.h>
@@ -40,8 +42,6 @@ __FBSDID("$FreeBSD$");
 
 #include "test-utils.h"
 
-#define	N(i)	(sizeof(i) / sizeof((i)[0]))
-
 #pragma STDC FENV_ACCESS	ON
 #pragma	STDC CX_LIMITED_RANGE	OFF
 
@@ -116,7 +116,7 @@ test_nan()
 
 	/* cexp(x + NaNi) = NaN + NaNi and optionally raises invalid */
 	/* cexp(NaN + yi) = NaN + NaNi and optionally raises invalid (|y|>0) */
-	for (i = 0; i < N(finites); i++) {
+	for (i = 0; i < nitems(finites); i++) {
 		printf("# Run %d..\n", i);
 		testall(CMPLXL(finites[i], NAN), CMPLXL(NAN, NAN),
 			ALL_STD_EXCEPT & ~FE_INVALID, 0, 0);
@@ -148,7 +148,7 @@ test_inf(void)
 	int i;
 
 	/* cexp(x + inf i) = NaN + NaNi and raises invalid */
-	for (i = 0; i < N(finites); i++) {
+	for (i = 0; i < nitems(finites); i++) {
 		printf("# Run %d..\n", i);
 		testall(CMPLXL(finites[i], INFINITY), CMPLXL(NAN, NAN),
 			ALL_STD_EXCEPT, FE_INVALID, 1);
@@ -189,7 +189,7 @@ test_reals(void)
 {
 	int i;
 
-	for (i = 0; i < N(finites); i++) {
+	for (i = 0; i < nitems(finites); i++) {
 		/* XXX could check exceptions more meticulously */
 		printf("# Run %d..\n", i);
 		test(cexp, CMPLXL(finites[i], 0.0),
@@ -212,7 +212,7 @@ test_imaginaries(void)
 {
 	int i;
 
-	for (i = 0; i < N(finites); i++) {
+	for (i = 0; i < nitems(finites); i++) {
 		printf("# Run %d..\n", i);
 		test(cexp, CMPLXL(0.0, finites[i]),
 		     CMPLXL(cos(finites[i]), sin(finites[i])),
@@ -244,7 +244,7 @@ test_small(void)
 	double x, y;
 	int i;
 
-	for (i = 0; i < N(tests); i += 4) {
+	for (i = 0; i < nitems(tests); i += 4) {
 		printf("# Run %d..\n", i);
 		a = tests[i];
 		b = tests[i + 1];
diff --git a/tools/regression/lib/msun/test-csqrt.c b/tools/regression/lib/msun/test-csqrt.c
index bc1817f..aa119d1 100644
--- a/tools/regression/lib/msun/test-csqrt.c
+++ b/tools/regression/lib/msun/test-csqrt.c
@@ -31,6 +31,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/param.h>
+
 #include <assert.h>
 #include <complex.h>
 #include <float.h>
@@ -39,8 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include "test-utils.h"
 
-#define	N(i)	(sizeof(i) / sizeof((i)[0]))
-
 /*
  * This is a test hook that can point to csqrtl(), _csqrt(), or to _csqrtf().
  * The latter two convert to float or double, respectively, and test csqrtf()
@@ -127,8 +127,8 @@ test_finite()
 	double x, y;
 	int i, j;
 
-	for (i = 0; i < N(tests); i += 4) {
-		for (j = 0; j < N(mults); j++) {
+	for (i = 0; i < nitems(tests); i += 4) {
+		for (j = 0; j < nitems(mults); j++) {
 			a = tests[i] * mults[j] * mults[j];
 			b = tests[i + 1] * mults[j] * mults[j];
 			x = tests[i + 2] * mults[j];
@@ -169,7 +169,7 @@ test_infinities()
 
 	int i;
 
-	for (i = 0; i < N(vals); i++) {
+	for (i = 0; i < nitems(vals); i++) {
 		if (isfinite(vals[i])) {
 			assert_equal(t_csqrt(CMPLXL(-INFINITY, vals[i])),
 			    CMPLXL(0.0, copysignl(INFINITY, vals[i])));
diff --git a/tools/regression/lib/msun/test-invtrig.c b/tools/regression/lib/msun/test-invtrig.c
index 2523d59..9b41fd5 100644
--- a/tools/regression/lib/msun/test-invtrig.c
+++ b/tools/regression/lib/msun/test-invtrig.c
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include "test-utils.h"
 
-#define	LEN(a)		(sizeof(a) / sizeof((a)[0]))
-
 #pragma STDC FENV_ACCESS ON
 
 /*
diff --git a/tools/regression/lib/msun/test-trig.c b/tools/regression/lib/msun/test-trig.c
index 80f1aef..1dcce1f 100644
--- a/tools/regression/lib/msun/test-trig.c
+++ b/tools/regression/lib/msun/test-trig.c
@@ -36,6 +36,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/param.h>
+
 #include <assert.h>
 #include <fenv.h>
 #include <float.h>
@@ -44,8 +46,6 @@ __FBSDID("$FreeBSD$");
 
 #include "test-utils.h"
 
-#define	LEN(a)		(sizeof(a) / sizeof((a)[0]))
-
 #pragma STDC FENV_ACCESS ON
 
 /*
@@ -155,7 +155,7 @@ run_reduction_tests(void)
 
 	int i;
 
-	for (i = 0; i < LEN(f_pi_odd); i++) {
+	for (i = 0; i < nitems(f_pi_odd); i++) {
 		assert(fabs(sinf(f_pi_odd[i])) < FLT_EPSILON);
 		assert(cosf(f_pi_odd[i]) == -1.0);
 		assert(fabs(tan(f_pi_odd[i])) < FLT_EPSILON);
@@ -173,7 +173,7 @@ run_reduction_tests(void)
 		assert(fabs(tanf(-f_pi_odd[i] * 2)) < FLT_EPSILON);
 	}
 
-	for (i = 0; i < LEN(d_pi_odd); i++) {
+	for (i = 0; i < nitems(d_pi_odd); i++) {
 		assert(fabs(sin(d_pi_odd[i])) < 2 * DBL_EPSILON);
 		assert(cos(d_pi_odd[i]) == -1.0);
 		assert(fabs(tan(d_pi_odd[i])) < 2 * DBL_EPSILON);
@@ -192,7 +192,7 @@ run_reduction_tests(void)
 	}
 
 #if LDBL_MANT_DIG > 53
-	for (i = 0; i < LEN(ld_pi_odd); i++) {
+	for (i = 0; i < nitems(ld_pi_odd); i++) {
 		assert(fabsl(sinl(ld_pi_odd[i])) < LDBL_EPSILON);
 		assert(cosl(ld_pi_odd[i]) == -1.0);
 		assert(fabsl(tanl(ld_pi_odd[i])) < LDBL_EPSILON);