Hi Pablo, On Thu, Dec 09, 2021 at 01:37:40AM +0100, Pablo Neira Ayuso wrote: > On Thu, Dec 09, 2021 at 01:22:54AM +0100, Phil Sutter wrote: > > This is just the exit_tryhelp() function which existed three times in > > identical form with a more suitable name. > > > > Signed-off-by: Phil Sutter <phil@xxxxxx> > > --- > > include/xtables.h | 1 + > > iptables/ip6tables.c | 19 ++++--------------- > > iptables/iptables.c | 19 ++++--------------- > > iptables/xtables.c | 21 +++++---------------- > > libxtables/xtables.c | 10 ++++++++++ > > 5 files changed, 24 insertions(+), 46 deletions(-) > > > > diff --git a/include/xtables.h b/include/xtables.h > > index ca674c2663eb4..fdf77d83199d0 100644 > > --- a/include/xtables.h > > +++ b/include/xtables.h > > @@ -501,6 +501,7 @@ xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask); > > > > extern struct xtables_globals *xt_params; > > #define xtables_error (xt_params->exit_err) > > +extern void xtables_exit_tryhelp(int status) __attribute__((noreturn)); > > Probably add this to xshared.c instead of libxtables? It's tricky, basic_exit_err() will start using it two patches later. So while xtables_exit_tryhelp() is not relevant to libxtables itself, it must be there. Cheers, Phil
