From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun, 2 Aug 2026 13:19:58 +0000 (+0100)
Subject: libkmod: remove duplicate _func_ in error messages
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac5aa3514d38fba74fc4aba6c5eeb5e85803b6e1;p=thirdparty%2Fkmod.git

libkmod: remove duplicate _func_ in error messages

Our logging macros already provide __func__ throughout. Drop the few
instances which manually add it yet again.

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

diff --git a/libkmod/libkmod-builtin.c b/libkmod/libkmod-builtin.c
index 8cc1bd23..d807cb3c 100644
--- a/libkmod/libkmod-builtin.c
+++ b/libkmod/libkmod-builtin.c
@@ -75,7 +75,7 @@ static ssize_t get_strings(struct kmod_builtin_info *info, const char *modname,
 		if (n == -1) {
 			if (!feof(info->fp)) {
 				count = -errno;
-				ERR(info->ctx, "get_strings: %m\n");
+				ERR(info->ctx, "%m\n");
 			}
 			break;
 		}
@@ -84,8 +84,7 @@ static ssize_t get_strings(struct kmod_builtin_info *info, const char *modname,
 		dot = strchr(line, '.');
 		if (dot == NULL) {
 			count = -EINVAL;
-			ERR(info->ctx, "get_strings: "
-				       "unexpected string without modname prefix\n");
+			ERR(info->ctx, "unexpected string without modname prefix\n");
 			return count;
 		}
 		if (strncmp(line, modname, modlen) || line[modlen] != '.') {
@@ -100,8 +99,7 @@ static ssize_t get_strings(struct kmod_builtin_info *info, const char *modname,
 		}
 		if (!strbuf_pushchars(buf, dot + 1) || !strbuf_pushchar(buf, '\0')) {
 			count = -ENOMEM;
-			ERR(info->ctx, "get_strings: "
-				       "failed to append modinfo string\n");
+			ERR(info->ctx, "failed to append modinfo string\n");
 			return count;
 		}
 		count++;
@@ -109,8 +107,7 @@ static ssize_t get_strings(struct kmod_builtin_info *info, const char *modname,
 
 	if (count == INTPTR_MAX) {
 		count = -ENOMEM;
-		ERR(info->ctx, "get_strings: "
-			       "too many modinfo strings encountered\n");
+		ERR(info->ctx, "too many modinfo strings encountered\n");
 		return count;
 	}