From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 10 Jan 2021 16:10:58 +0000 (+0000)
Subject: libpakfire: arch: Refactor search using a static array size
X-Git-Tag: 0.9.28~1285^2~909
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=757fdc17c940ca208310873106d82ee3e5134a46;p=pakfire.git

libpakfire: arch: Refactor search using a static array size

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/arch.c b/src/libpakfire/arch.c
index 5cf301730..6b3e7f618 100644
--- a/src/libpakfire/arch.c
+++ b/src/libpakfire/arch.c
@@ -76,11 +76,14 @@ static const struct pakfire_arch PAKFIRE_ARCHES[] = {
 		.name = "armv5tel",
 		.platform = "arm",
 	},
-	NULL,
 };
 
 static const struct pakfire_arch* pakfire_arch_find(const char* name) {
-	for (const struct pakfire_arch* arch = PAKFIRE_ARCHES; arch; arch++) {
+	const size_t length = sizeof(PAKFIRE_ARCHES) / sizeof(*PAKFIRE_ARCHES);
+
+	for (unsigned int i = 0; i < length; i++) {
+		const struct pakfire_arch* arch = &PAKFIRE_ARCHES[i];
+
 		if (strcmp(arch->name, name) == 0)
 			return arch;
 	}