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

- shrink modprobe a little bit (~-40 bytes). ACKed by Yann.

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2008-05-31 18:50:17 +00:00
parent a76669c595
commit e0fd13e901
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modutils/modprobe.c
View File

@ -443,8 +443,7 @@ static struct dep_t *build_dep(void)
/* It's a dep description continuation */ /* It's a dep description continuation */
p = line_buffer; p = line_buffer;
while (p && *p && isblank(*p)) p = skip_whitespace(p);
p++;
/* p points to the first dependable module; if NULL, no dependable module */ /* p points to the first dependable module; if NULL, no dependable module */
if (p && *p) { if (p && *p) {
@ -468,10 +467,8 @@ static struct dep_t *build_dep(void)
/* find the beginning of the module file name */ /* find the beginning of the module file name */
deps = bb_basename(p); deps = bb_basename(p);
if (deps == p) { if (deps == p)
while (isblank(*deps)) deps = skip_whitespace(deps);
deps++;
}
/* find the end of the module name in the file name */ /* find the end of the module name in the file name */
if (ENABLE_FEATURE_2_6_MODULES if (ENABLE_FEATURE_2_6_MODULES
@ -901,7 +898,7 @@ int modprobe_main(int argc, char **argv)
do { do {
/* argv[optind] can be NULL here */ /* argv[optind] can be NULL here */
if (mod_remove(argv[optind])) { if (mod_remove(argv[optind])) {
bb_error_msg("failed to remove module %s", bb_error_msg("failed to %s module %s", "remove",
argv[optind]); argv[optind]);
rc = EXIT_FAILURE; rc = EXIT_FAILURE;
} }
@ -911,7 +908,7 @@ int modprobe_main(int argc, char **argv)
bb_error_msg_and_die("no module or pattern provided"); bb_error_msg_and_die("no module or pattern provided");
if (mod_insert(argv[optind], argc - optind - 1, argv + optind + 1)) if (mod_insert(argv[optind], argc - optind - 1, argv + optind + 1))
bb_error_msg_and_die("failed to load module %s", argv[optind]); bb_error_msg_and_die("failed to %s module %s", "load", argv[optind]);
} }
/* Here would be a good place to free up memory allocated during the dependencies build. */ /* Here would be a good place to free up memory allocated during the dependencies build. */