diff options
-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) | |||
18 | { | 18 | { |
19 | int ch, rc = 0; | 19 | int ch, rc = 0; |
20 | int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 0; | 20 | int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 0; |
21 | int show_only = 0, quiet = 0, remove = 0, do_syslog = 0, verbose = 0; | 21 | int show_only = 0, quiet = 0, remove_opt = 0, do_syslog = 0, verbose = 0; |
22 | char *load_type = NULL, config = NULL; | 22 | char *load_type = NULL, *config = NULL; |
23 | 23 | ||
24 | while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) | 24 | while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) |
25 | switch(ch) { | 25 | switch(ch) { |
@@ -45,7 +45,7 @@ extern int modprobe_main(int argc, char** argv) | |||
45 | quiet++; | 45 | quiet++; |
46 | break; | 46 | break; |
47 | case 'r': | 47 | case 'r': |
48 | remove++; | 48 | remove_opt++; |
49 | break; | 49 | break; |
50 | case 's': | 50 | case 's': |
51 | do_syslog++; | 51 | do_syslog++; |
@@ -76,7 +76,7 @@ extern int modprobe_main(int argc, char** argv) | |||
76 | if (list) | 76 | if (list) |
77 | exit(EXIT_SUCCESS); | 77 | exit(EXIT_SUCCESS); |
78 | 78 | ||
79 | if (remove) { | 79 | if (remove_opt) { |
80 | do { | 80 | do { |
81 | sprintf(cmd, "rmmod %s %s %s", | 81 | sprintf(cmd, "rmmod %s %s %s", |
82 | optind >= argc ? "-a" : "", | 82 | 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) | |||
18 | { | 18 | { |
19 | int ch, rc = 0; | 19 | int ch, rc = 0; |
20 | int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 0; | 20 | int loadall = 0, showconfig = 0, debug = 0, autoclean = 0, list = 0; |
21 | int show_only = 0, quiet = 0, remove = 0, do_syslog = 0, verbose = 0; | 21 | int show_only = 0, quiet = 0, remove_opt = 0, do_syslog = 0, verbose = 0; |
22 | char *load_type = NULL, config = NULL; | 22 | char *load_type = NULL, *config = NULL; |
23 | 23 | ||
24 | while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) | 24 | while ((ch = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) |
25 | switch(ch) { | 25 | switch(ch) { |
@@ -45,7 +45,7 @@ extern int modprobe_main(int argc, char** argv) | |||
45 | quiet++; | 45 | quiet++; |
46 | break; | 46 | break; |
47 | case 'r': | 47 | case 'r': |
48 | remove++; | 48 | remove_opt++; |
49 | break; | 49 | break; |
50 | case 's': | 50 | case 's': |
51 | do_syslog++; | 51 | do_syslog++; |
@@ -76,7 +76,7 @@ extern int modprobe_main(int argc, char** argv) | |||
76 | if (list) | 76 | if (list) |
77 | exit(EXIT_SUCCESS); | 77 | exit(EXIT_SUCCESS); |
78 | 78 | ||
79 | if (remove) { | 79 | if (remove_opt) { |
80 | do { | 80 | do { |
81 | sprintf(cmd, "rmmod %s %s %s", | 81 | sprintf(cmd, "rmmod %s %s %s", |
82 | optind >= argc ? "-a" : "", | 82 | optind >= argc ? "-a" : "", |