summaryrefslogtreecommitdiffstats
path: root/iptables-xml.c
diff options
context:
space:
mode:
authorLutz Jaenicke <ljaenicke@innominate.com>2006-12-09 13:06:04 +0000
committerYasuyuki KOZAKAI <yasuyuki@netfilter.org>2006-12-09 13:06:04 +0000
commite78c69c8146c5dcd096ba13ac03d7a7bb90e3ea7 (patch)
tree63fbb5f19945b545b4f4fa88dea92083f42d5d14 /iptables-xml.c
parent72f7962bc4972fd823a14cc81f2ed6d7a2060cae (diff)
fix compile/install error for iptables-xml with DO_MULTI=1 (Lutz Jaenicke)
Diffstat (limited to 'iptables-xml.c')
-rw-r--r--iptables-xml.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/iptables-xml.c b/iptables-xml.c
index 34437e07..ce3049c2 100644
--- a/iptables-xml.c
+++ b/iptables-xml.c
@@ -26,10 +26,10 @@
/* no need to link with iptables.o */
const char *program_name;
const char *program_version;
-int line = 0;
-void
-exit_error(enum exittype status, char *msg, ...)
+#ifndef IPTABLES_MULTI
+int line = 0;
+void exit_error(enum exittype status, char *msg, ...)
{
va_list args;
@@ -41,6 +41,7 @@ exit_error(enum exittype status, char *msg, ...)
/* On error paths, make sure that we don't leak memory */
exit(status);
}
+#endif
static void print_usage(const char *name, const char *version)
__attribute__ ((noreturn));
@@ -66,7 +67,7 @@ print_usage(const char *name, const char *version)
exit(1);
}
-int
+static int
parse_counters(char *string, struct ipt_counters *ctr)
{
if (string != NULL)
@@ -605,7 +606,7 @@ do_rule(char *pcnt, char *bcnt, int argc, char *argv[], int argvattr[])
#ifdef IPTABLES_MULTI
int
-iptables_restore_main(int argc, char *argv[])
+iptables_xml_main(int argc, char *argv[])
#else
int
main(int argc, char *argv[])