emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modprobe-small: code shrink

Browse Source 
function                                             old     new   delta
pathname_matches_modname                              80      42     -38

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2015-01-11 17:46:56 +01:00
parent 3c75b1c34e
commit 1b6715345f
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modutils/modprobe-small.c
View File

@ -163,6 +163,15 @@ static char *filename2modname(const char *filename, char *modname)
return 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 */ /* Take "word word", return malloced "word",NUL,"word",NUL,NUL */
static char* str_2_list(const char *str) 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); 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, static FAST_FUNC int fileAction(const char *pathname,
struct stat *sb UNUSED_PARAM, struct stat *sb UNUSED_PARAM,
void *modname_to_match, void *modname_to_match,