From e54fedfd85f1b8e680f4fb036b70c51706054076 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 27 Aug 2007 13:24:16 +0000
Subject: extract filename2modname() function

---
 mdk-stage1/modules.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 92cae21ba..ce61b3f01 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -86,6 +86,17 @@ static char *kernel_module_extension(void)
 	return ".ko.gz";
 }
 
+
+static char * filename2modname(char * filename) {
+	char * modname = strdup(filename);
+	while (modname && *modname) {
+		if (*modname == '-')
+			*modname = '_';
+		modname++;
+	}
+	return modname;
+}
+
 static int load_modules_dependencies(void)
 {
 	char * deps_file = "/modules/modules.dep";
@@ -104,7 +115,6 @@ static int load_modules_dependencies(void)
 	line = 0;
 	while (start < (buf+s.st_size) && *start) {
 		char * tmp_deps[50];
-		char * modp;
 
 		end = strchr(start, '\n');
 		*end = '\0';
@@ -121,14 +131,7 @@ static int load_modules_dependencies(void)
 
 		/* sort of a good line */
 		modules_deps[line].filename = strdup(start);
-
-		modules_deps[line].modname = strdup(start);
-		modp = modules_deps[line].modname;
-		while (modp && *modp) {
-			if (*modp == '-')
-				*modp = '_';
-			modp++;
-		}
+		modules_deps[line].modname = filename2modname(start);
 
 		start = ptr;
 		i = 0;
-- 
cgit v1.2.1