Cleanup some warnings and a really obvious bug.

-Erik
This commit is contained in:
Eric Andersen 2001-07-25 07:23:38 +00:00
parent 655584b07a
commit 1b06419e60
2 changed files with 8 additions and 8 deletions

View File

@ -18,8 +18,8 @@ extern int modprobe_main(int argc, char** argv)
{ {
int ch, rc = 0; int ch, rc = 0;
int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 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; int show_only = 0, quiet = 0, remove_opt = 0, do_syslog = 0, verbose = 0;
char *load_type = NULL, config = NULL; char *load_type = NULL, *config = NULL;
while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1)
switch(ch) { switch(ch) {
@ -45,7 +45,7 @@ extern int modprobe_main(int argc, char** argv)
quiet++; quiet++;
break; break;
case 'r': case 'r':
remove++; remove_opt++;
break; break;
case 's': case 's':
do_syslog++; do_syslog++;
@ -76,7 +76,7 @@ extern int modprobe_main(int argc, char** argv)
if (list) if (list)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
if (remove) { if (remove_opt) {
do { do {
sprintf(cmd, "rmmod %s %s %s", sprintf(cmd, "rmmod %s %s %s",
optind >= argc ? "-a" : "", optind >= argc ? "-a" : "",

View File

@ -18,8 +18,8 @@ extern int modprobe_main(int argc, char** argv)
{ {
int ch, rc = 0; int ch, rc = 0;
int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 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; int show_only = 0, quiet = 0, remove_opt = 0, do_syslog = 0, verbose = 0;
char *load_type = NULL, config = NULL; char *load_type = NULL, *config = NULL;
while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1)
switch(ch) { switch(ch) {
@ -45,7 +45,7 @@ extern int modprobe_main(int argc, char** argv)
quiet++; quiet++;
break; break;
case 'r': case 'r':
remove++; remove_opt++;
break; break;
case 's': case 's':
do_syslog++; do_syslog++;
@ -76,7 +76,7 @@ extern int modprobe_main(int argc, char** argv)
if (list) if (list)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
if (remove) { if (remove_opt) {
do { do {
sprintf(cmd, "rmmod %s %s %s", sprintf(cmd, "rmmod %s %s %s",
optind >= argc ? "-a" : "", optind >= argc ? "-a" : "",