diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-23 16:25:17 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-23 16:25:17 +0100 |
| commit | 651a2697f725f10c1ebdb8947925b5a9c6cf4fe2 (patch) | |
| tree | e2373083cc4bf57af9c114c311ff089b84835f0f /modutils | |
| parent | 37a658c4c86fa5ad9fb6f76cba2fca80f4249036 (diff) | |
| download | busybox-w32-651a2697f725f10c1ebdb8947925b5a9c6cf4fe2.tar.gz busybox-w32-651a2697f725f10c1ebdb8947925b5a9c6cf4fe2.tar.bz2 busybox-w32-651a2697f725f10c1ebdb8947925b5a9c6cf4fe2.zip | |
*: merge some common strings
text data bss dec hexfilename
838650 8009 0 846659 ceb43busybox_old
838519 8009 0 846528 ceac0busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/modprobe-small.c | 2 | ||||
| -rw-r--r-- | modutils/modprobe.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index 53b7c9468..cf22b9471 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
| @@ -402,7 +402,7 @@ static void write_out_dep_bb(int fd) | |||
| 402 | 402 | ||
| 403 | if (rename(DEPFILE_BB".new", DEPFILE_BB) != 0) { | 403 | if (rename(DEPFILE_BB".new", DEPFILE_BB) != 0) { |
| 404 | err: | 404 | err: |
| 405 | bb_perror_msg("can't create %s", DEPFILE_BB); | 405 | bb_perror_msg("can't create '%s'", DEPFILE_BB); |
| 406 | unlink(DEPFILE_BB".new"); | 406 | unlink(DEPFILE_BB".new"); |
| 407 | } else { | 407 | } else { |
| 408 | ok: | 408 | ok: |
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index f511bc2ed..69b9e4687 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
| @@ -298,7 +298,7 @@ static int do_modprobe(struct module_entry *m) | |||
| 298 | rc = bb_delete_module(m2->modname, O_EXCL); | 298 | rc = bb_delete_module(m2->modname, O_EXCL); |
| 299 | if (rc) { | 299 | if (rc) { |
| 300 | if (first) { | 300 | if (first) { |
| 301 | bb_error_msg("failed to unload module %s: %s", | 301 | bb_error_msg("can't unload module %s: %s", |
| 302 | humanly_readable_name(m2), | 302 | humanly_readable_name(m2), |
| 303 | moderror(rc)); | 303 | moderror(rc)); |
| 304 | break; | 304 | break; |
| @@ -328,7 +328,7 @@ static int do_modprobe(struct module_entry *m) | |||
| 328 | rc = 0; | 328 | rc = 0; |
| 329 | free(options); | 329 | free(options); |
| 330 | if (rc) { | 330 | if (rc) { |
| 331 | bb_error_msg("failed to load module %s (%s): %s", | 331 | bb_error_msg("can't load module %s (%s): %s", |
| 332 | humanly_readable_name(m2), | 332 | humanly_readable_name(m2), |
| 333 | fn, | 333 | fn, |
| 334 | moderror(rc) | 334 | moderror(rc) |
