No change in patches 1, 2, 4 and 6 since v1. Patch 3 moves exit_tryhelp() into xshared.c instead of libxtables. Since basic_exit_err() can't call it from there, its body is merged into the latter in patch 5. Since both functions overlap in parts, this is just about two printf() calls. Phil Sutter (6): xshared: Share print_match_save() between legacy ip*tables xshared: Share a common printhelp function xshared: Share exit_tryhelp() xtables_globals: Introduce program_variant libxtables: Extend basic_exit_err() iptables-*-restore: Drop pointless line reference include/xtables.h | 2 +- iptables/ip6tables.c | 154 ++--------------------------------------- iptables/iptables.c | 154 ++--------------------------------------- iptables/xshared.c | 143 ++++++++++++++++++++++++++++++++++++++ iptables/xshared.h | 5 ++ iptables/xtables-arp.c | 3 +- iptables/xtables-eb.c | 7 +- iptables/xtables.c | 132 +++-------------------------------- libxtables/xtables.c | 20 +++++- 9 files changed, 194 insertions(+), 426 deletions(-) -- 2.33.0
