From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Sat, 22 Feb 2025 14:24:33 +0000 (+0100)
Subject: modinfo: reduce amount of continue statements
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45a0b46535603418f1ff90f696c70952bb52b3c3;p=thirdparty%2Fkmod.git

modinfo: reduce amount of continue statements

Clarify that the code does not perform error checks, for which we
regularly use checks and continue at the start, but merely checks
how to print/filter the data.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Link: https://github.com/kmod-project/kmod/pull/290
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/tools/modinfo.c b/tools/modinfo.c
index 6f8147ea..9c719a9b 100644
--- a/tools/modinfo.c
+++ b/tools/modinfo.c
@@ -201,32 +201,24 @@ static int modinfo_do(struct kmod_module *mod)
 	kmod_list_foreach(l, list) {
 		const char *key = kmod_module_info_get_key(l);
 		const char *value = kmod_module_info_get_value(l);
-		size_t keylen;
 
 		if (field != NULL) {
-			if (!streq(field, key))
-				continue;
-			/* filtered output contains no key, just value */
-			printf("%s%c", value, separator);
-			continue;
-		}
-
-		if (streq(key, "parm") || streq(key, "parmtype")) {
+			if (streq(field, key)) {
+				/* filtered output contains no key, just value */
+				printf("%s%c", value, separator);
+			}
+		} else if (streq(key, "parm") || streq(key, "parmtype")) {
 			err = process_parm(key, value, &params);
 			if (err < 0)
 				goto end;
-			continue;
-		}
-
-		if (separator == '\0') {
+		} else if (separator == '\0') {
 			printf("%s=%s%c", key, value, separator);
-			continue;
+		} else {
+			size_t keylen = strlen(key);
+			if (keylen > 15)
+				keylen = 15;
+			printf("%s:%-*s%s%c", key, 15 - (int)keylen, "", value, separator);
 		}
-
-		keylen = strlen(key);
-		if (keylen > 15)
-			keylen = 15;
-		printf("%s:%-*s%s%c", key, 15 - (int)keylen, "", value, separator);
 	}
 
 	if (field != NULL)