From 3c0e4590ffbca3b0153eaff3338b331de2fe737c Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 17 Oct 2019 22:26:50 +0200 Subject: xtables-restore: Integrate restore callbacks into struct nft_xt_restore_parse There's really no point in passing those as separate parameter. While being at it, make them static const everywhere. Signed-off-by: Phil Sutter Acked-by: Pablo Neira Ayuso --- iptables/nft-shared.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'iptables/nft-shared.h') diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index e236a981..4ca551bd 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -215,13 +215,6 @@ void do_parse(struct nft_handle *h, int argc, char *argv[], struct nft_xt_cmd_parse *p, struct iptables_command_state *cs, struct xtables_args *args); -struct nft_xt_restore_parse { - FILE *in; - int testing; - const char *tablename; - bool commit; -}; - struct nftnl_chain_list; struct nft_xt_restore_cb { @@ -241,9 +234,16 @@ struct nft_xt_restore_cb { int (*abort)(struct nft_handle *h); }; +struct nft_xt_restore_parse { + FILE *in; + int testing; + const char *tablename; + bool commit; + const struct nft_xt_restore_cb *cb; +}; + void xtables_restore_parse(struct nft_handle *h, - const struct nft_xt_restore_parse *p, - const struct nft_xt_restore_cb *cb); + const struct nft_xt_restore_parse *p); void nft_check_xt_legacy(int family, bool is_ipt_save); #endif -- cgit v1.2.3