[PATCH 03/13] lib: Migrate to ARRAY_SIZE()

[Florian Bezdeka <florian.bezdeka@siemens.com>]

Use ARRAY_SIZE() where possible. No functional change.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 lib/boilerplate/ancillaries.c | 4 ++--
 lib/boilerplate/setup.c       | 2 +-
 lib/cobalt/mutex.c            | 2 +-
 lib/cobalt/sigshadow.c        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/boilerplate/ancillaries.c b/lib/boilerplate/ancillaries.c
index a0754cb48..457ef0b7c 100644
--- a/lib/boilerplate/ancillaries.c
+++ b/lib/boilerplate/ancillaries.c
@@ -182,7 +182,7 @@ static const char *__esym_map[] = {
 	__esym_def(EPROTO),
 };
 
-#define __esym_max  (sizeof(__esym_map) / sizeof(__esym_map[0]))
+#define __esym_max	ARRAY_SIZE(__esym_map)
 
 const char *symerror(int errnum)
 {
@@ -472,7 +472,7 @@ char *lookup_command(const char *cmd)
 	char *path;
 	int n, ret;
 
-	for (n = 0; n < sizeof(dirs) / sizeof(dirs[0]); n++) {
+	for (n = 0; n < ARRAY_SIZE(dirs); n++) {
 		ret = asprintf(&path, "%s/%s", dirs[n], cmd);
 		if (ret < 0)
 			return NULL;
diff --git a/lib/boilerplate/setup.c b/lib/boilerplate/setup.c
index 5139560e8..a9138e96b 100644
--- a/lib/boilerplate/setup.c
+++ b/lib/boilerplate/setup.c
@@ -304,7 +304,7 @@ static struct option *build_option_array(int *base_opt_startp)
 	const struct option *p;
 	int nopts;
 
-	nopts = sizeof(base_options) / sizeof(base_options[0]);
+	nopts = ARRAY_SIZE(base_options);
 
 	if (!pvlist_empty(&setup_list)) {
 		pvlist_for_each_entry(setup, &setup_list, __reserved.next) {
diff --git a/lib/cobalt/mutex.c b/lib/cobalt/mutex.c
index 54f6b8461..c77d10684 100644
--- a/lib/cobalt/mutex.c
+++ b/lib/cobalt/mutex.c
@@ -196,7 +196,7 @@ static int __attribute__((cold))
 	};
 	int i;
 
-	for (i = sizeof(mutex_types) / sizeof(mutex_types[0]); i > 0; --i) {
+	for (i = ARRAY_SIZE(mutex_types); i > 0; --i) {
 		if (memcmp(mutex, &mutex_initializers[i - 1],
 				sizeof(mutex_initializers[0])) == 0)
 			return mutex_types[i - 1];
diff --git a/lib/cobalt/sigshadow.c b/lib/cobalt/sigshadow.c
index b03703526..092cadb08 100644
--- a/lib/cobalt/sigshadow.c
+++ b/lib/cobalt/sigshadow.c
@@ -53,7 +53,7 @@ int cobalt_sigshadow_handler(int sig, siginfo_t *si, void *ctxt)
 		break;
 	case SIGSHADOW_ACTION_BACKTRACE:
 		arg = sigshadow_arg(si->si_int);
-		nr = backtrace(frames, sizeof(frames) / sizeof(frames[0]));
+		nr = backtrace(frames, ARRAY_SIZE(frames));
 		/* Skip the sighandler context. */
 		skip = nr > 3 ? 3 : 0;
 		XENOMAI_SYSCALL3(sc_cobalt_backtrace, nr - skip, frames + skip, arg);

-- 
2.39.2