From 316d8efbb7cd2d252c8627df77261a466493d09b Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 26 Nov 2021 21:11:25 +0100 Subject: libxtables: Extend basic_exit_err() Basically merge the function with xtables_exit_error, printing a status-specific footer for parameter or version problems. Signed-off-by: Phil Sutter --- iptables/iptables.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'iptables/iptables.c') diff --git a/iptables/iptables.c b/iptables/iptables.c index 191877ec..ba04fbc6 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -84,13 +84,10 @@ static struct option original_opts[] = { {NULL}, }; -void iptables_exit_error(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3))); - struct xtables_globals iptables_globals = { .option_offset = 0, .program_version = PACKAGE_VERSION " (legacy)", .orig_opts = original_opts, - .exit_err = iptables_exit_error, .compat_rev = xtables_compatible_revision, }; @@ -105,26 +102,6 @@ exit_printhelp(const struct xtables_rule_match *matches) exit(0); } -void -iptables_exit_error(enum xtables_exittype status, const char *msg, ...) -{ - va_list args; - - va_start(args, msg); - fprintf(stderr, "%s v%s: ", prog_name, prog_vers); - vfprintf(stderr, msg, args); - va_end(args); - fprintf(stderr, "\n"); - if (status == PARAMETER_PROBLEM) - exit_tryhelp(status, line); - if (status == VERSION_PROBLEM) - fprintf(stderr, - "Perhaps iptables or your kernel needs to be upgraded.\n"); - /* On error paths, make sure that we don't leak memory */ - xtables_free_opts(1); - exit(status); -} - /* * All functions starting with "parse" should succeed, otherwise * the program fails. -- cgit v1.2.3