diff options
| author | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-12-22 01:48:07 +0000 |
|---|---|---|
| committer | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-12-22 01:48:07 +0000 |
| commit | 2230e04b24d58710b30d25f032c1996a143ba261 (patch) | |
| tree | b8cb8d939032c0806d62161b01e5836cb808dc3f /modutils | |
| parent | 3c7e7e11b41d4a421bcf42fd1bf72a537e051d4a (diff) | |
| download | busybox-w32-2230e04b24d58710b30d25f032c1996a143ba261.tar.gz busybox-w32-2230e04b24d58710b30d25f032c1996a143ba261.tar.bz2 busybox-w32-2230e04b24d58710b30d25f032c1996a143ba261.zip | |
Use busybox error handling functions wherever possible.
git-svn-id: svn://busybox.net/trunk/busybox@1489 69ca8d6d-28ef-0310-b511-8ec308f3f277
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 @@ | |||
| 78 | #ifndef MODUTILS_MODULE_H | 78 | #ifndef MODUTILS_MODULE_H |
| 79 | #define MODUTILS_MODULE_H 1 | 79 | #define MODUTILS_MODULE_H 1 |
| 80 | 80 | ||
| 81 | #ident "$Id: insmod.c,v 1.33 2000/12/18 03:57:16 kraai Exp $" | 81 | #ident "$Id: insmod.c,v 1.34 2000/12/22 01:48:07 kraai Exp $" |
| 82 | 82 | ||
| 83 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 83 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
| 84 | We do not use the kernel headers directly because we do not wish | 84 | We do not use the kernel headers directly because we do not wish |
| @@ -284,7 +284,7 @@ int delete_module(const char *); | |||
| 284 | #ifndef MODUTILS_OBJ_H | 284 | #ifndef MODUTILS_OBJ_H |
| 285 | #define MODUTILS_OBJ_H 1 | 285 | #define MODUTILS_OBJ_H 1 |
| 286 | 286 | ||
| 287 | #ident "$Id: insmod.c,v 1.33 2000/12/18 03:57:16 kraai Exp $" | 287 | #ident "$Id: insmod.c,v 1.34 2000/12/22 01:48:07 kraai Exp $" |
| 288 | 288 | ||
| 289 | /* The relocatable object is manipulated using elfin types. */ | 289 | /* The relocatable object is manipulated using elfin types. */ |
| 290 | 290 | ||
| @@ -2952,10 +2952,8 @@ extern int insmod_main( int argc, char **argv) | |||
| 2952 | memcpy(m_filename, *argv, strlen(*argv)); | 2952 | memcpy(m_filename, *argv, strlen(*argv)); |
| 2953 | 2953 | ||
| 2954 | 2954 | ||
| 2955 | if ((f = obj_load(fp)) == NULL) { | 2955 | if ((f = obj_load(fp)) == NULL) |
| 2956 | perror("Could not load the module\n"); | 2956 | perror_msg_and_die("Could not load the module"); |
| 2957 | return EXIT_FAILURE; | ||
| 2958 | } | ||
| 2959 | 2957 | ||
| 2960 | if (get_modinfo_value(f, "kernel_version") == NULL) | 2958 | if (get_modinfo_value(f, "kernel_version") == NULL) |
| 2961 | m_has_modinfo = 0; | 2959 | 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) | |||
| 45 | switch (**argv) { | 45 | switch (**argv) { |
| 46 | case 'a': | 46 | case 'a': |
| 47 | /* Unload _all_ unused modules via NULL delete_module() call */ | 47 | /* Unload _all_ unused modules via NULL delete_module() call */ |
| 48 | if (delete_module(NULL)) { | 48 | if (delete_module(NULL)) |
| 49 | perror("rmmod"); | 49 | perror_msg_and_die("rmmod"); |
| 50 | return EXIT_FAILURE; | ||
| 51 | } | ||
| 52 | return EXIT_SUCCESS; | 50 | return EXIT_SUCCESS; |
| 53 | default: | 51 | default: |
| 54 | usage(rmmod_usage); | 52 | usage(rmmod_usage); |
| @@ -58,7 +56,7 @@ extern int rmmod_main(int argc, char **argv) | |||
| 58 | 56 | ||
| 59 | while (argc-- > 0) { | 57 | while (argc-- > 0) { |
| 60 | if (delete_module(*argv) < 0) { | 58 | if (delete_module(*argv) < 0) { |
| 61 | perror(*argv); | 59 | perror_msg("%s", *argv); |
| 62 | ret = EXIT_FAILURE; | 60 | ret = EXIT_FAILURE; |
| 63 | } | 61 | } |
| 64 | argv++; | 62 | argv++; |