diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-07-25 07:23:38 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-07-25 07:23:38 +0000 |
| commit | 1b06419e6013ce8319be2a868bc22a6e0f4d7671 (patch) | |
| tree | 1cb599eb0a2e0e38d1578fd8f9803bb4ec36154a | |
| parent | 655584b07a4b7a1d792c37f7edf1f3467ab803e7 (diff) | |
Cleanup some warnings and a really obvious bug.
-Erik
| -rw-r--r-- | modprobe.c | 8 | ||||
| -rw-r--r-- | modutils/modprobe.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modprobe.c b/modprobe.c index 971ff0afa..05b40c53f 100644 --- a/modprobe.c +++ b/modprobe.c @@ -18,8 +18,8 @@ extern int modprobe_main(int argc, char** argv) { int ch, rc = 0; int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 0; - int show_only = 0, quiet = 0, remove = 0, do_syslog = 0, verbose = 0; - char *load_type = NULL, config = NULL; + int show_only = 0, quiet = 0, remove_opt = 0, do_syslog = 0, verbose = 0; + char *load_type = NULL, *config = NULL; while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) switch(ch) { @@ -45,7 +45,7 @@ extern int modprobe_main(int argc, char** argv) quiet++; break; case 'r': - remove++; + remove_opt++; break; case 's': do_syslog++; @@ -76,7 +76,7 @@ extern int modprobe_main(int argc, char** argv) if (list) exit(EXIT_SUCCESS); - if (remove) { + if (remove_opt) { do { sprintf(cmd, "rmmod %s %s %s", optind >= argc ? "-a" : "", diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 971ff0afa..05b40c53f 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -18,8 +18,8 @@ extern int modprobe_main(int argc, char** argv) { int ch, rc = 0; int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 0; - int show_only = 0, quiet = 0, remove = 0, do_syslog = 0, verbose = 0; - char *load_type = NULL, config = NULL; + int show_only = 0, quiet = 0, remove_opt = 0, do_syslog = 0, verbose = 0; + char *load_type = NULL, *config = NULL; while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) switch(ch) { @@ -45,7 +45,7 @@ extern int modprobe_main(int argc, char** argv) quiet++; break; case 'r': - remove++; + remove_opt++; break; case 's': do_syslog++; @@ -76,7 +76,7 @@ extern int modprobe_main(int argc, char** argv) if (list) exit(EXIT_SUCCESS); - if (remove) { + if (remove_opt) { do { sprintf(cmd, "rmmod %s %s %s", optind >= argc ? "-a" : "", |