diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-12 08:52:02 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-12 08:52:02 +0000 |
| commit | 15611bb95815de14bcb35f66bd10089a322ea30b (patch) | |
| tree | 818f4e4a208cc04e37f2ea12fd4bda4eae30dd4c /modutils | |
| parent | 16d58d75ee11f3b50550fbef7da12a4adbab66d4 (diff) | |
| download | busybox-15611bb95815de14bcb35f66bd10089a322ea30b.tar.gz | |
A few more string duplicates found & eliminated
# size busybox_old busybox_unstripped
text data bss dec hex filename
679693 2700 15632 698025 aa6a9 busybox_old
679523 2700 15632 697855 aa5ff busybox_unstripped
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index c84e2b96c..a81ca7fba 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -4112,18 +4112,13 @@ int insmod_main( int argc, char **argv) } if (strncmp(uts_info.release, m_strversion, STRVERSIONLEN) != 0) { - if (flag_force_load) { - bb_error_msg("warning: kernel-module version mismatch\n" - "\t%s was compiled for kernel version %s\n" - "\twhile this kernel is version %s", - m_filename, m_strversion, uts_info.release); - } else { - bb_error_msg("kernel-module version mismatch\n" - "\t%s was compiled for kernel version %s\n" - "\twhile this kernel is version %s.", - m_filename, m_strversion, uts_info.release); + bb_error_msg("%skernel-module version mismatch\n" + "\t%s was compiled for kernel version %s\n" + "\twhile this kernel is version %s", + flag_force_load ? "warning: " : "", + m_filename, m_strversion, uts_info.release); + if (!flag_force_load) goto out; - } } } k_crcs = 0; |