diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-24 19:54:36 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-24 19:54:36 +0000 |
commit | d9c6a001e3356656ab3bc31f18778602484075e0 (patch) | |
tree | 476be84fbf98f42de053b50cee4da8e7e03e5757 | |
parent | e9b3321b9f4c85acd13db6fc5a6de821e597b6f9 (diff) | |
download | busybox-w32-d9c6a001e3356656ab3bc31f18778602484075e0.tar.gz busybox-w32-d9c6a001e3356656ab3bc31f18778602484075e0.tar.bz2 busybox-w32-d9c6a001e3356656ab3bc31f18778602484075e0.zip |
insmod: shorten message text; style fixes
-rw-r--r-- | modutils/insmod.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 0baf5d7f2..3c8bb41bb 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -3972,7 +3972,7 @@ int insmod_main( int argc, char **argv) | |||
3972 | int m_version, m_crcs; | 3972 | int m_version, m_crcs; |
3973 | #endif | 3973 | #endif |
3974 | #if ENABLE_FEATURE_CLEAN_UP | 3974 | #if ENABLE_FEATURE_CLEAN_UP |
3975 | FILE *fp = 0; | 3975 | FILE *fp = NULL; |
3976 | #else | 3976 | #else |
3977 | FILE *fp; | 3977 | FILE *fp; |
3978 | #endif | 3978 | #endif |
@@ -4030,7 +4030,7 @@ int insmod_main( int argc, char **argv) | |||
4030 | tmp1 = 0; /* flag for free(m_name) before exit() */ | 4030 | tmp1 = 0; /* flag for free(m_name) before exit() */ |
4031 | } | 4031 | } |
4032 | 4032 | ||
4033 | /* Get a filedesc for the module. Check we we have a complete path */ | 4033 | /* Get a filedesc for the module. Check that we have a complete path */ |
4034 | if (stat(arg1, &st) < 0 || !S_ISREG(st.st_mode) | 4034 | if (stat(arg1, &st) < 0 || !S_ISREG(st.st_mode) |
4035 | || (fp = fopen(arg1, "r")) == NULL | 4035 | || (fp = fopen(arg1, "r")) == NULL |
4036 | ) { | 4036 | ) { |
@@ -4057,12 +4057,12 @@ int insmod_main( int argc, char **argv) | |||
4057 | } | 4057 | } |
4058 | 4058 | ||
4059 | /* Check if we have found anything yet */ | 4059 | /* Check if we have found anything yet */ |
4060 | if (m_filename == 0 || ((fp = fopen(m_filename, "r")) == NULL)) { | 4060 | if (!m_filename || ((fp = fopen(m_filename, "r")) == NULL)) { |
4061 | char module_dir[FILENAME_MAX]; | 4061 | char module_dir[FILENAME_MAX]; |
4062 | 4062 | ||
4063 | free(m_filename); | 4063 | free(m_filename); |
4064 | m_filename = 0; | 4064 | m_filename = NULL; |
4065 | if (realpath (_PATH_MODULES, module_dir) == NULL) | 4065 | if (realpath(_PATH_MODULES, module_dir) == NULL) |
4066 | strcpy(module_dir, _PATH_MODULES); | 4066 | strcpy(module_dir, _PATH_MODULES); |
4067 | /* No module found under /lib/modules/`uname -r`, this | 4067 | /* No module found under /lib/modules/`uname -r`, this |
4068 | * time cast the net a bit wider. Search /lib/modules/ */ | 4068 | * time cast the net a bit wider. Search /lib/modules/ */ |
@@ -4072,11 +4072,11 @@ int insmod_main( int argc, char **argv) | |||
4072 | if (m_filename == 0 | 4072 | if (m_filename == 0 |
4073 | || ((fp = fopen(m_filename, "r")) == NULL) | 4073 | || ((fp = fopen(m_filename, "r")) == NULL) |
4074 | ) { | 4074 | ) { |
4075 | bb_error_msg("%s: no module by that name found", m_fullName); | 4075 | bb_error_msg("%s: module not found", m_fullName); |
4076 | goto out; | 4076 | goto out; |
4077 | } | 4077 | } |
4078 | } else | 4078 | } else |
4079 | bb_error_msg_and_die("%s: no module by that name found", m_fullName); | 4079 | bb_error_msg_and_die("%s: module not found", m_fullName); |
4080 | } | 4080 | } |
4081 | } else | 4081 | } else |
4082 | m_filename = xstrdup(arg1); | 4082 | m_filename = xstrdup(arg1); |