diff options
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 10 | ||||
| -rw-r--r-- | modutils/rmmod.c | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index cbe00c2b4..7391b4fb2 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -78,7 +78,7 @@ #ifndef MODUTILS_MODULE_H #define MODUTILS_MODULE_H 1 -#ident "$Id: insmod.c,v 1.33 2000/12/18 03:57:16 kraai Exp $" +#ident "$Id: insmod.c,v 1.34 2000/12/22 01:48:07 kraai Exp $" /* This file contains the structures used by the 2.0 and 2.1 kernels. We do not use the kernel headers directly because we do not wish @@ -284,7 +284,7 @@ int delete_module(const char *); #ifndef MODUTILS_OBJ_H #define MODUTILS_OBJ_H 1 -#ident "$Id: insmod.c,v 1.33 2000/12/18 03:57:16 kraai Exp $" +#ident "$Id: insmod.c,v 1.34 2000/12/22 01:48:07 kraai Exp $" /* The relocatable object is manipulated using elfin types. */ @@ -2952,10 +2952,8 @@ extern int insmod_main( int argc, char **argv) memcpy(m_filename, *argv, strlen(*argv)); - if ((f = obj_load(fp)) == NULL) { - perror("Could not load the module\n"); - return EXIT_FAILURE; - } + if ((f = obj_load(fp)) == NULL) + perror_msg_and_die("Could not load the module"); if (get_modinfo_value(f, "kernel_version") == NULL) m_has_modinfo = 0; diff --git a/modutils/rmmod.c b/modutils/rmmod.c index f5d7d359a..52adc7bcd 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c @@ -45,10 +45,8 @@ extern int rmmod_main(int argc, char **argv) switch (**argv) { case 'a': /* Unload _all_ unused modules via NULL delete_module() call */ - if (delete_module(NULL)) { - perror("rmmod"); - return EXIT_FAILURE; - } + if (delete_module(NULL)) + perror_msg_and_die("rmmod"); return EXIT_SUCCESS; default: usage(rmmod_usage); @@ -58,7 +56,7 @@ extern int rmmod_main(int argc, char **argv) while (argc-- > 0) { if (delete_module(*argv) < 0) { - perror(*argv); + perror_msg("%s", *argv); ret = EXIT_FAILURE; } argv++; |