summaryrefslogtreecommitdiffstats
path: root/iptables/xtables-eb.c
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2018-11-23 15:32:53 +0100
committerFlorian Westphal <fw@strlen.de>2018-11-23 15:53:38 +0100
commit2ed6c85f8743a83d2b302bf6bd8d16b5efa3bb14 (patch)
treed708e964ad67641d65a2e6d300e3b42703c46014 /iptables/xtables-eb.c
parentb0466ae6fbc0a93b69591171c54aa79063e23f3d (diff)
ebtables: Use xtables_exit_err()
When e.g. ebtables-nft detects an incompatible table, a stray '.' was printed as last line of output: | # ebtables-nft -L | table `filter' is incompatible, use 'nft' tool. | . This comes from ebtables' own exit_err callback. Instead use the common one which also provides useful version information. While being at it, align the final error message in xtables_eb_main() with how the others print it. Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/xtables-eb.c')
-rw-r--r--iptables/xtables-eb.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index 87189144..16d87412 100644
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -291,23 +291,12 @@ struct option ebt_original_options[] =
{ 0 }
};
-static void __attribute__((__noreturn__,format(printf,2,3)))
-ebt_print_error(enum xtables_exittype status, const char *format, ...)
-{
- va_list l;
-
- va_start(l, format);
- vfprintf(stderr, format, l);
- fprintf(stderr, ".\n");
- va_end(l);
- exit(-1);
-}
-
+extern void xtables_exit_error(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3)));
struct xtables_globals ebtables_globals = {
.option_offset = 0,
.program_version = IPTABLES_VERSION,
.orig_opts = ebt_original_options,
- .exit_err = ebt_print_error,
+ .exit_err = xtables_exit_error,
.compat_rev = nft_compatible_revision,
};