commit e78c69c8146c5dcd096ba13ac03d7a7bb90e3ea7
author Lutz Jaenicke <ljaenicke@innominate.com> Sat Dec 09 13:06:04 2006 +0000
committer Yasuyuki KOZAKAI <yasuyuki@netfilter.org> Sat Dec 09 13:06:04 2006 +0000
tree 63fbb5f19945b545b4f4fa88dea92083f42d5d14
parent 72f7962bc4972fd823a14cc81f2ed6d7a2060cae

fix compile/install error for iptables-xml with DO_MULTI=1 (Lutz Jaenicke)

iptables-xml.c

diff --git a/iptables-xml.c b/iptables-xml.c
index 34437e0..ce3049c 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 @@
 	/* 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 @@
 	exit(1);
 }
 
-int
+static int
 parse_counters(char *string, struct ipt_counters *ctr)
 {
 	if (string != NULL)
@@ -605,7 +606,7 @@
 
 #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[])