From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 30 Jul 2026 15:09:14 +0000 (+0100)
Subject: modinfo: kill off struct param::{desc,type}len
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39b1014af581fafb1ca4c91c3117a30dfcd6d47b;p=thirdparty%2Fkmod.git

modinfo: kill off struct param::{desc,type}len

The respective strings are guaranteed to be nil terminated, so drop the
strlen() and respective len(th) fields.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/451
Signed-off-by: Lucas De Marchi <demarchi@kernel.org>
---

diff --git a/tools/modinfo.c b/tools/modinfo.c
index 1ccdfaaf..e907a08a 100644
--- a/tools/modinfo.c
+++ b/tools/modinfo.c
@@ -30,8 +30,6 @@ struct param {
 	const char *desc;
 	const char *type;
 	int namelen;
-	int desclen;
-	int typelen;
 };
 
 enum parm_info {
@@ -42,10 +40,9 @@ enum parm_info {
 static int add_param(const char *name, size_t namelen, enum parm_info parm_info,
 		     const char *value, struct param *params, unsigned int params_count)
 {
-	size_t valuelen = strlen(value);
 	struct param *it;
 
-	if (namelen > INT_MAX || valuelen > INT_MAX)
+	if (namelen > INT_MAX)
 		return -EINVAL;
 
 	/* We are guaranteed to have a match, or at least one empty entry */
@@ -63,11 +60,9 @@ static int add_param(const char *name, size_t namelen, enum parm_info parm_info,
 		switch (parm_info) {
 		case (parm_desc):
 			it->desc = value;
-			it->desclen = (int)valuelen;
 			break;
 		case (parm_type):
 			it->type = value;
-			it->typelen = (int)valuelen;
 			break;
 		}
 		break;
@@ -245,11 +240,11 @@ static int modinfo_do(struct kmod_module *mod)
 			continue;
 
 		if (p->type != NULL)
-			sprintf(sbuf, "%.*s:%.*s (%.*s)", p->namelen, p->name, p->desclen,
-				p->desc, p->typelen, p->type);
+			sprintf(sbuf, "%.*s:%s (%s)", p->namelen, p->name,
+				p->desc ? p->desc : "", p->type);
 		else
-			sprintf(sbuf, "%.*s:%.*s", p->namelen, p->name, p->desclen,
-				p->desc);
+			sprintf(sbuf, "%.*s:%s", p->namelen, p->name,
+				p->desc ? p->desc : "");
 
 		print_line(print_parm ? NULL : "parm", sbuf);
 	}