diff options
| author | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-12-01 02:55:13 +0000 |
|---|---|---|
| committer | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-12-01 02:55:13 +0000 |
| commit | 8cb2f75a75eb9694f36312ab4856d335ab2bac19 (patch) | |
| tree | 013a1e7752113314831ad7d51854ce8dc9e0918b /modutils | |
| parent | 8bfd1e939579e988ad4d2c0cc1425448f1fd7236 (diff) | |
| download | busybox-w32-8cb2f75a75eb9694f36312ab4856d335ab2bac19.tar.gz busybox-w32-8cb2f75a75eb9694f36312ab4856d335ab2bac19.tar.bz2 busybox-w32-8cb2f75a75eb9694f36312ab4856d335ab2bac19.zip | |
Stop using TRUE and FALSE for exit status.
git-svn-id: svn://busybox.net/trunk/busybox@1360 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 12 | ||||
| -rw-r--r-- | modutils/rmmod.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 4f96c950e..6386b9407 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | #ifndef MODUTILS_MODULE_H | 77 | #ifndef MODUTILS_MODULE_H |
| 78 | #define MODUTILS_MODULE_H 1 | 78 | #define MODUTILS_MODULE_H 1 |
| 79 | 79 | ||
| 80 | #ident "$Id: insmod.c,v 1.28 2000/10/23 18:03:46 kraai Exp $" | 80 | #ident "$Id: insmod.c,v 1.29 2000/12/01 02:55:13 kraai Exp $" |
| 81 | 81 | ||
| 82 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 82 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
| 83 | We do not use the kernel headers directly because we do not wish | 83 | We do not use the kernel headers directly because we do not wish |
| @@ -283,7 +283,7 @@ int delete_module(const char *); | |||
| 283 | #ifndef MODUTILS_OBJ_H | 283 | #ifndef MODUTILS_OBJ_H |
| 284 | #define MODUTILS_OBJ_H 1 | 284 | #define MODUTILS_OBJ_H 1 |
| 285 | 285 | ||
| 286 | #ident "$Id: insmod.c,v 1.28 2000/10/23 18:03:46 kraai Exp $" | 286 | #ident "$Id: insmod.c,v 1.29 2000/12/01 02:55:13 kraai Exp $" |
| 287 | 287 | ||
| 288 | /* The relocatable object is manipulated using elfin types. */ | 288 | /* The relocatable object is manipulated using elfin types. */ |
| 289 | 289 | ||
| @@ -2769,7 +2769,7 @@ extern int insmod_main( int argc, char **argv) | |||
| 2769 | FILE *fp; | 2769 | FILE *fp; |
| 2770 | struct obj_file *f; | 2770 | struct obj_file *f; |
| 2771 | char m_name[BUFSIZ + 1] = "\0"; | 2771 | char m_name[BUFSIZ + 1] = "\0"; |
| 2772 | int exit_status = FALSE; | 2772 | int exit_status = EXIT_FAILURE; |
| 2773 | int m_has_modinfo; | 2773 | int m_has_modinfo; |
| 2774 | #ifdef BB_FEATURE_INSMOD_VERSION_CHECKING | 2774 | #ifdef BB_FEATURE_INSMOD_VERSION_CHECKING |
| 2775 | int k_version; | 2775 | int k_version; |
| @@ -2833,7 +2833,7 @@ extern int insmod_main( int argc, char **argv) | |||
| 2833 | || ((fp = fopen(m_filename, "r")) == NULL)) | 2833 | || ((fp = fopen(m_filename, "r")) == NULL)) |
| 2834 | { | 2834 | { |
| 2835 | errorMsg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); | 2835 | errorMsg("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); |
| 2836 | exit(FALSE); | 2836 | return EXIT_FAILURE; |
| 2837 | } | 2837 | } |
| 2838 | } else | 2838 | } else |
| 2839 | fatalError("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); | 2839 | fatalError("No module named '%s' found in '%s'\n", m_fullName, _PATH_MODULES); |
| @@ -2843,7 +2843,7 @@ extern int insmod_main( int argc, char **argv) | |||
| 2843 | 2843 | ||
| 2844 | if ((f = obj_load(fp)) == NULL) { | 2844 | if ((f = obj_load(fp)) == NULL) { |
| 2845 | perror("Could not load the module\n"); | 2845 | perror("Could not load the module\n"); |
| 2846 | exit(FALSE); | 2846 | return EXIT_FAILURE; |
| 2847 | } | 2847 | } |
| 2848 | 2848 | ||
| 2849 | if (get_modinfo_value(f, "kernel_version") == NULL) | 2849 | if (get_modinfo_value(f, "kernel_version") == NULL) |
| @@ -2981,7 +2981,7 @@ extern int insmod_main( int argc, char **argv) | |||
| 2981 | goto out; | 2981 | goto out; |
| 2982 | } | 2982 | } |
| 2983 | 2983 | ||
| 2984 | exit_status = TRUE; | 2984 | exit_status = EXIT_SUCCESS; |
| 2985 | 2985 | ||
| 2986 | out: | 2986 | out: |
| 2987 | fclose(fp); | 2987 | fclose(fp); |
diff --git a/modutils/rmmod.c b/modutils/rmmod.c index dd293523d..f5d7d359a 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c | |||
| @@ -34,7 +34,7 @@ _syscall1(int, delete_module, const char *, name) | |||
| 34 | 34 | ||
| 35 | extern int rmmod_main(int argc, char **argv) | 35 | extern int rmmod_main(int argc, char **argv) |
| 36 | { | 36 | { |
| 37 | int ret = TRUE; | 37 | int ret = EXIT_SUCCESS; |
| 38 | if (argc <= 1) { | 38 | if (argc <= 1) { |
| 39 | usage(rmmod_usage); | 39 | usage(rmmod_usage); |
| 40 | } | 40 | } |
| @@ -47,9 +47,9 @@ extern int rmmod_main(int argc, char **argv) | |||
| 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("rmmod"); |
| 50 | exit(FALSE); | 50 | return EXIT_FAILURE; |
| 51 | } | 51 | } |
| 52 | exit(TRUE); | 52 | return EXIT_SUCCESS; |
| 53 | default: | 53 | default: |
| 54 | usage(rmmod_usage); | 54 | usage(rmmod_usage); |
| 55 | } | 55 | } |
| @@ -59,7 +59,7 @@ extern int rmmod_main(int argc, char **argv) | |||
| 59 | while (argc-- > 0) { | 59 | while (argc-- > 0) { |
| 60 | if (delete_module(*argv) < 0) { | 60 | if (delete_module(*argv) < 0) { |
| 61 | perror(*argv); | 61 | perror(*argv); |
| 62 | ret=FALSE; | 62 | ret = EXIT_FAILURE; |
| 63 | } | 63 | } |
| 64 | argv++; | 64 | argv++; |
| 65 | } | 65 | } |
