src: remove unused IPTABLES_MULTI define

This dead code has been lingering around since commit v1.4.5~7.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index a06827880fa7faf63fe01b6b7111fa0851f01dab..addb15986fa47669416ba34d1d875417212c765a 100644 (file)
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -15,7 +15,7 @@ libxtables_la_LIBADD  =
 endif
 
 xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
-xtables_multi_CFLAGS   = ${AM_CFLAGS} -DIPTABLES_MULTI
+xtables_multi_CFLAGS   = ${AM_CFLAGS}
 xtables_multi_LDFLAGS  = -rdynamic
 xtables_multi_LDADD    = ../extensions/libext.a
 if ENABLE_STATIC

diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c
index ae147d55473cd75dc072c3b833687ec819b06475..985744d654f36b7ea13e8bd7f2e55780f0ad99a9 100644 (file)
--- a/iptables/ip6tables-restore.c
+++ b/iptables/ip6tables-restore.c
@@ -113,11 +113,7 @@ static void free_argv(void) {
                free(newargv[i]);
 }
 
-#ifdef IPTABLES_MULTI
 int ip6tables_restore_main(int argc, char *argv[])
-#else
-int main(int argc, char *argv[])
-#endif
 {
        struct ip6tc_handle *handle = NULL;
        char buffer[10240];

diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c
index 39a33256185cd2f8756327ea948d2abe81850983..ad0e70f07041734bfb0adece792f02f607c9785f 100644 (file)
--- a/iptables/ip6tables-save.c
+++ b/iptables/ip6tables-save.c
@@ -131,11 +131,7 @@ static int do_output(const char *tablename)
  * :Chain name POLICY packets bytes
  * rule
  */
-#ifdef IPTABLES_MULTI
 int ip6tables_save_main(int argc, char *argv[])
-#else
-int main(int argc, char *argv[])
-#endif
 {
        const char *tablename = NULL;
        int c;

diff --git a/iptables/ip6tables-standalone.c b/iptables/ip6tables-standalone.c
index 9d8d5a0f1ee6abf9fc07b3edec888137c8170efd..6b82935367ee2be301e41229dace8bf56e349d22 100644 (file)
--- a/iptables/ip6tables-standalone.c
+++ b/iptables/ip6tables-standalone.c
@@ -37,13 +37,8 @@
 #include <ip6tables.h>
 #include "ip6tables-multi.h"
 
-#ifdef IPTABLES_MULTI
 int
 ip6tables_main(int argc, char *argv[])
-#else
-int
-main(int argc, char *argv[])
-#endif
 {
        int ret;
        char *table = "filter";

diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c
index 1cb833c0fdf3b895b2ac856ce4cce1dc74f1bf8b..d0bd79a9c8c07810d78a9c09f97d895aa335df7a 100644 (file)
--- a/iptables/iptables-restore.c
+++ b/iptables/iptables-restore.c
@@ -113,13 +113,8 @@ static void free_argv(void) {
                free(newargv[i]);
 }
 
-#ifdef IPTABLES_MULTI
 int
 iptables_restore_main(int argc, char *argv[])
-#else
-int
-main(int argc, char *argv[])
-#endif
 {
        struct iptc_handle *handle = NULL;
        char buffer[10240];

diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c
index 7542bdc08d419f4ab508ce8aba462c3859b9725c..73fba12afc3ab8269a1f8e84725ee336bfab725f 100644 (file)
--- a/iptables/iptables-save.c
+++ b/iptables/iptables-save.c
@@ -129,13 +129,8 @@ static int do_output(const char *tablename)
  * :Chain name POLICY packets bytes
  * rule
  */
-#ifdef IPTABLES_MULTI
 int
 iptables_save_main(int argc, char *argv[])
-#else
-int
-main(int argc, char *argv[])
-#endif
 {
        const char *tablename = NULL;
        int c;

diff --git a/iptables/iptables-standalone.c b/iptables/iptables-standalone.c
index 87f1d31af92ff8b0b8ddd9ef75d3ff65478effea..1ebec33defba5c851056d39dc91acde8ee57bb33 100644 (file)
--- a/iptables/iptables-standalone.c
+++ b/iptables/iptables-standalone.c
@@ -38,13 +38,8 @@
 #include <iptables.h>
 #include "iptables-multi.h"
 
-#ifdef IPTABLES_MULTI
 int
 iptables_main(int argc, char *argv[])
-#else
-int
-main(int argc, char *argv[])
-#endif
 {
        int ret;
        char *table = "filter";

diff --git a/iptables/iptables-xml.c b/iptables/iptables-xml.c
index 502b2d96244af9852c946de2edbb6e9098145c00..4ecddcb71bec4d588e3236a37c4628e2568c0b63 100644 (file)
--- a/iptables/iptables-xml.c
+++ b/iptables/iptables-xml.c
@@ -23,10 +23,6 @@
 #define DEBUGP(x, args...)
 #endif
 
-#ifndef IPTABLES_MULTI
-int line = 0;
-#endif
-
 struct xtables_globals iptables_xml_globals = {
        .option_offset = 0,
        .program_version = IPTABLES_VERSION,
@@ -617,13 +613,8 @@ do_rule(char *pcnt, char *bcnt, int argc, char *argv[], int argvattr[])
        do_rule_part(NULL, NULL, 1, argc, argv, argvattr);
 }
 
-#ifdef IPTABLES_MULTI
 int
 iptables_xml_main(int argc, char *argv[])
-#else
-int
-main(int argc, char *argv[])
-#endif
 {
        char buffer[10240];
        int c;