This series merges legacy ip6tables-save with iptables-save and ip6tables-restore with iptables-restore. For convenience, struct xtc_ops from libiptc is extended by a few more callbacks. Note: This series is based on my recent 28 patches covscan fixes series. Phil Sutter (3): libiptc: Extend struct xtc_ops ip6tables-restore: Merge into iptables-restore.c ip6tables-save: Merge into iptables-save.c include/libiptc/xtcshared.h | 5 + iptables/Makefile.am | 8 +- iptables/ip6tables-restore.c | 391 ----------------------------------- iptables/ip6tables-save.c | 203 ------------------ iptables/iptables-restore.c | 154 ++++++++++---- iptables/iptables-save.c | 179 +++++++++++----- libiptc/Makefile.am | 4 +- libiptc/libiptc.c | 4 + 8 files changed, 250 insertions(+), 698 deletions(-) delete mode 100644 iptables/ip6tables-restore.c delete mode 100644 iptables/ip6tables-save.c -- 2.18.0
