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

insmod: shorten message text; style fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2007-09-24 19:54:36 +00:00
parent e9b3321b9f
commit d9c6a001e3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modutils/insmod.c
View File

@ -3972,7 +3972,7 @@ int insmod_main( int argc, char **argv)
int m_version, m_crcs; int m_version, m_crcs;
#endif #endif
#if ENABLE_FEATURE_CLEAN_UP #if ENABLE_FEATURE_CLEAN_UP
FILE *fp = 0; FILE *fp = NULL;
#else #else
FILE *fp; FILE *fp;
#endif #endif
@ -4030,7 +4030,7 @@ int insmod_main( int argc, char **argv)
tmp1 = 0; /* flag for free(m_name) before exit() */ tmp1 = 0; /* flag for free(m_name) before exit() */
} }
/* Get a filedesc for the module. Check we we have a complete path */ /* Get a filedesc for the module. Check that we have a complete path */
if (stat(arg1, &st) < 0 || !S_ISREG(st.st_mode) if (stat(arg1, &st) < 0 || !S_ISREG(st.st_mode)
|| (fp = fopen(arg1, "r")) == NULL || (fp = fopen(arg1, "r")) == NULL
) { ) {
@ -4057,12 +4057,12 @@ int insmod_main( int argc, char **argv)
} }
/* Check if we have found anything yet */ /* Check if we have found anything yet */
if (m_filename == 0 || ((fp = fopen(m_filename, "r")) == NULL)) { if (!m_filename || ((fp = fopen(m_filename, "r")) == NULL)) {
char module_dir[FILENAME_MAX]; char module_dir[FILENAME_MAX];
free(m_filename); free(m_filename);
m_filename = 0; m_filename = NULL;
if (realpath (_PATH_MODULES, module_dir) == NULL) if (realpath(_PATH_MODULES, module_dir) == NULL)
strcpy(module_dir, _PATH_MODULES); strcpy(module_dir, _PATH_MODULES);
/* No module found under /lib/modules/`uname -r`, this /* No module found under /lib/modules/`uname -r`, this
* time cast the net a bit wider. Search /lib/modules/ */ * time cast the net a bit wider. Search /lib/modules/ */
@ -4072,11 +4072,11 @@ int insmod_main( int argc, char **argv)
if (m_filename == 0 if (m_filename == 0
|| ((fp = fopen(m_filename, "r")) == NULL) || ((fp = fopen(m_filename, "r")) == NULL)
) { ) {
bb_error_msg("%s: no module by that name found", m_fullName); bb_error_msg("%s: module not found", m_fullName);
goto out; goto out;
} }
} else } else
bb_error_msg_and_die("%s: no module by that name found", m_fullName); bb_error_msg_and_die("%s: module not found", m_fullName);
} }
} else } else
m_filename = xstrdup(arg1); m_filename = xstrdup(arg1);