From 8b7baebc93989106fd5d26b262d0ce191f8ef7c0 Mon Sep 17 00:00:00 2001 From: Jamal Hadi Salim Date: Wed, 11 Feb 2009 13:05:43 +0100 Subject: libxtables: simple aliasing macro for exit_error Rename xtables_globals exit_error cb to exit_err and introduce a very simple aliasing macro to point to it. convert iptables, ip6tables and iptables_xml to use it. Note iptables_xml does not have to define its own exit_error() since it can use the basic one provided. Signed-off-by: Jamal Hadi Salim Signed-off-by: Patrick McHardy --- ip6tables.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ip6tables.c') diff --git a/ip6tables.c b/ip6tables.c index 7561353f..9262b141 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -145,12 +145,13 @@ int line = -1; static struct option *opts = original_opts; static unsigned int global_option_offset = 0; +void ip6tables_exit_error(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3))); struct xtables_globals ip6tables_globals = { .option_offset = 0, .program_version = IPTABLES_VERSION, .program_name = "ip6tables", .opts = original_opts, - .exit_error = exit_error, + .exit_err = ip6tables_exit_error, }; /* Table of legal combinations of commands and options. If any of the @@ -336,7 +337,7 @@ exit_printhelp(struct ip6tables_rule_match *matches) } void -exit_error(enum xtables_exittype status, const char *msg, ...) +ip6tables_exit_error(enum xtables_exittype status, const char *msg, ...) { va_list args; -- cgit v1.2.3