From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 11 Jan 2015 16:46:56 +0000 (+0100)
Subject: modprobe-small: code shrink
X-Git-Tag: 1_24_0~224
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1b6715345f2ad026482c336d2844c2d7fe64a25c;p=oweals%2Fbusybox.git

modprobe-small: code shrink

function                                             old     new   delta
pathname_matches_modname                              80      42     -38

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index cf8a3f0fe..cafbdc0b2 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -163,6 +163,15 @@ static char *filename2modname(const char *filename, char *modname)
 	return modname;
 }
 
+static int pathname_matches_modname(const char *pathname, const char *modname)
+{
+	int r;
+	char name[MODULE_NAME_LEN];
+	filename2modname(bb_get_last_path_component_nostrip(pathname), name);
+	r = (strcmp(name, modname) == 0);
+	return r;
+}
+
 /* Take "word word", return malloced "word",NUL,"word",NUL,NUL */
 static char* str_2_list(const char *str)
 {
@@ -295,18 +304,6 @@ static void parse_module(module_info *info, const char *pathname)
 	free(module_image);
 }
 
-static int pathname_matches_modname(const char *pathname, const char *modname)
-{
-	int r;
-	char name[MODULE_NAME_LEN];
-	const char *fname = bb_get_last_path_component_nostrip(pathname);
-	const char *suffix = strrstr(fname, ".ko");
-	safe_strncpy(name, fname, suffix - fname + 1);
-	replace(name, '-', '_');
-	r = (strcmp(name, modname) == 0);
-	return r;
-}
-
 static FAST_FUNC int fileAction(const char *pathname,
 		struct stat *sb UNUSED_PARAM,
 		void *modname_to_match,