v4: rename do_command() to do_command4()

Signed-off-by: Maciej Zenczykowski <maze@google.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/iptables.h b/include/iptables.h
index 204c92eace29bb7a744bef9afa8f2e65be16edf7..65b32909e4721c37f326fe66184239d8defe3fcb 100644 (file)
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -7,7 +7,7 @@
 #include <iptables/internal.h>
 
 /* Your shared library should call one of these. */
-extern int do_command(int argc, char *argv[], char **table,
+extern int do_command4(int argc, char *argv[], char **table,
                      struct iptc_handle **handle);
 extern int delete_chain4(const ipt_chainlabel chain, int verbose,
                        struct iptc_handle *handle);

diff --git a/iptables-restore.c b/iptables-restore.c
index 6163a92566fe512605b7bb27f410bd27ca7e47a0..e4f0604f82a9cb5429dfb02d48ba62e28c043cab 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -438,13 +438,13 @@ main(int argc, char *argv[])
                                }
                        }
 
-                       DEBUGP("calling do_command(%u, argv, &%s, handle):\n",
+                       DEBUGP("calling do_command4(%u, argv, &%s, handle):\n",
                                newargc, curtable);
 
                        for (a = 0; a < newargc; a++)
                                DEBUGP("argv[%u]: %s\n", a, newargv[a]);
 
-                       ret = do_command(newargc, newargv,
+                       ret = do_command4(newargc, newargv,
                                         &newargv[2], &handle);
 
                        free_argv();

diff --git a/iptables-standalone.c b/iptables-standalone.c
index 38dd2c28426bc3cf6dbfb27b66e6e633ba006e24..b0859464ee78c7c87e5e5ab2b0566502f399c5a0 100644 (file)
--- a/iptables-standalone.c
+++ b/iptables-standalone.c
@@ -62,7 +62,7 @@ main(int argc, char *argv[])
        init_extensions4();
 #endif
 
-       ret = do_command(argc, argv, &table, &handle);
+       ret = do_command4(argc, argv, &table, &handle);
        if (ret) {
                ret = iptc_commit(handle);
                iptc_free(handle);

diff --git a/iptables-xml.c b/iptables-xml.c
index 57c7486d496a7bbdfb4b08cf763b167aa6b08445..dc3cd4f21056e4cbb225b7e03dc402985ce71186 100644 (file)
--- a/iptables-xml.c
+++ b/iptables-xml.c
@@ -844,7 +844,7 @@ main(int argc, char *argv[])
                                }
                        }
 
-                       DEBUGP("calling do_command(%u, argv, &%s, handle):\n",
+                       DEBUGP("calling do_command4(%u, argv, &%s, handle):\n",
                               newargc, curTable);
 
                        for (a = 0; a < newargc; a++)

diff --git a/iptables.c b/iptables.c
index b7c94981f0de6936c48f1474cad4ddd3ed8f3f9b..0995d6f31674feeee1c52ac7f1a26070eba1d2ab 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -1413,7 +1413,7 @@ static void command_match(struct iptables_command_state *cs)
        }
 }
 
-int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle)
+int do_command4(int argc, char *argv[], char **table, struct iptc_handle **handle)
 {
        struct iptables_command_state cs;
        struct ipt_entry *e = NULL;
@@ -1437,11 +1437,11 @@ int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle
        cs.jumpto = "";
        cs.argv = argv;
 
-       /* re-set optind to 0 in case do_command gets called
+       /* re-set optind to 0 in case do_command4 gets called
         * a second time */
        optind = 0;
 
-       /* clear mflags in case do_command gets called a second time
+       /* clear mflags in case do_command4 gets called a second time
         * (we clear the global list of all matches for security)*/
        for (m = xtables_matches; m; m = m->next)
                m->mflags = 0;