Cleanup some warnings and a really obvious bug.

 -Erik

diff --git a/modprobe.c b/modprobe.c
index 971ff0afa39269fb427d85fa5f6660bf8558b6c0..05b40c53f855a50b9124163377c6c57f11c36198 100644 (file)
--- 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 971ff0afa39269fb427d85fa5f6660bf8558b6c0..05b40c53f855a50b9124163377c6c57f11c36198 100644 (file)
--- 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" : "",