From 1bc5ec61d8d960e1679b42f55c8f96992ced34ef Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Tue, 23 Sep 2025 19:17:14 -0700 Subject: maint: prefer countof over ARRAY_CARDINALITY * bootstrap.conf (gnulib_modules): Add stdcountof-h. * src/system.h: Include stdcountof.h. (ARRAY_CARDINALITY): Remove definition. * .gitignore (/lib/stdcountof.h): Ignore Gnulib generated file. * src/csplit.c: Use countof instead of ARRAY_CARDINALITY. * src/df.c: Likewise. * src/digest.c: Likewise. * src/dircolors.c: Likewise. * src/factor.c: Likewise. * src/join.c: Likewise. * src/ls.c: Likewise. * src/od.c: Likewise. * src/sort.c: Likewise. * src/stdbuf.c: Likewise. * src/tr.c: Likewise. --- src/df.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/df.c') diff --git a/src/df.c b/src/df.c index 857f76cf4..75e638c5e 100644 --- a/src/df.c +++ b/src/df.c @@ -441,7 +441,7 @@ decode_output_arg (char const *arg) /* process S. */ display_field_t field = INVALID_FIELD; - for (idx_t i = 0; i < ARRAY_CARDINALITY (field_data); i++) + for (idx_t i = 0; i < countof (field_data); i++) { if (streq (field_data[i].arg, s)) { -- cgit v1.2.3