Patch 1 merges a common function in legacy ip*tables, the remaining ones deal with help printing: Patch 2 merges the three almost identical copies of iptables help text into a single function. Patches 3, 4 and 5 extend libxtables enough to provide a default exit_err callback which all ip*tables may use as-is. Patch 6 removes duplicated info from output in a specific error condition. The benefit here is mostly that there are four spots less which make use of that global 'line' variable. Phil Sutter (6): xshared: Share print_match_save() between legacy ip*tables xshared: Share a common printhelp function libxtables: Add xtables_exit_tryhelp() xtables_globals: Introduce program_variant libxtables: Extend basic_exit_err() iptables-*-restore: Drop pointless line reference include/xtables.h | 3 +- iptables/ip6tables.c | 154 ++--------------------------------------- iptables/iptables.c | 154 ++--------------------------------------- iptables/xshared.c | 133 +++++++++++++++++++++++++++++++++++ iptables/xshared.h | 4 ++ iptables/xtables-arp.c | 3 +- iptables/xtables-eb.c | 7 +- iptables/xtables.c | 132 +++-------------------------------- libxtables/xtables.c | 26 ++++++- 9 files changed, 190 insertions(+), 426 deletions(-) -- 2.33.0
