From 5dd19de34380c91ad07bbe79a34726e59891cf54 Mon Sep 17 00:00:00 2001 From: Jamal Hadi Salim Date: Fri, 13 Feb 2009 10:42:24 -0500 Subject: libxtables: general follow-up cleanup Kill program_name, program_version and xtables_program_name. Signed-off-by: Jamal Hadi Salim --- iptables-xml.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'iptables-xml.c') diff --git a/iptables-xml.c b/iptables-xml.c index 4bb05578..f1837ed0 100644 --- a/iptables-xml.c +++ b/iptables-xml.c @@ -25,14 +25,18 @@ #define DEBUGP(x, args...) #endif -/* no need to link with iptables.o */ -const char *program_name; -const char *program_version; - #ifndef IPTABLES_MULTI int line = 0; #endif +struct xtables_globals iptables_xml_globals = { + .option_offset = 0, + .program_version = IPTABLES_VERSION, + .program_name = "iptables-xml", +}; +#define prog_name iptables_xml_globals.program_name +#define prog_vers iptables_xml_globals.program_version + static void print_usage(const char *name, const char *version) __attribute__ ((noreturn)); @@ -294,7 +298,7 @@ saveChain(char *chain, char *policy, struct ipt_counters *ctr) if (nextChain >= maxChains) { exit_error(PARAMETER_PROBLEM, "%s: line %u chain name invalid\n", - program_name, line); + prog_name, line); exit(1); }; chains[nextChain].chain = strdup(chain); @@ -618,12 +622,6 @@ do_rule(char *pcnt, char *bcnt, int argc, char *argv[], int argvattr[]) do_rule_part(NULL, NULL, 1, argc, argv, argvattr); } -struct xtables_globals iptables_xml_globals = { - .option_offset = 0, - .program_version = IPTABLES_VERSION, - .program_name = "iptables-xml", -}; - #ifdef IPTABLES_MULTI int iptables_xml_main(int argc, char *argv[]) @@ -636,8 +634,6 @@ main(int argc, char *argv[]) int c; FILE *in; - program_name = "iptables-xml"; - program_version = IPTABLES_VERSION; line = 0; xtables_set_params(&iptables_xml_globals); @@ -703,7 +699,7 @@ main(int argc, char *argv[]) if (!table) { exit_error(PARAMETER_PROBLEM, "%s: line %u table name invalid\n", - program_name, line); + prog_name, line); exit(1); } openTable(table); @@ -720,7 +716,7 @@ main(int argc, char *argv[]) if (!chain) { exit_error(PARAMETER_PROBLEM, "%s: line %u chain name invalid\n", - program_name, line); + prog_name, line); exit(1); } @@ -731,7 +727,7 @@ main(int argc, char *argv[]) if (!policy) { exit_error(PARAMETER_PROBLEM, "%s: line %u policy invalid\n", - program_name, line); + prog_name, line); exit(1); } @@ -864,13 +860,13 @@ main(int argc, char *argv[]) } if (!ret) { fprintf(stderr, "%s: line %u failed\n", - program_name, line); + prog_name, line); exit(1); } } if (curTable[0]) { fprintf(stderr, "%s: COMMIT expected at line %u\n", - program_name, line + 1); + prog_name, line + 1); exit(1); } -- cgit v1.2.3