From 139b3fe4bd5121501e60fe07963ea527d7f0bd36 Mon Sep 17 00:00:00 2001 From: Jamal Hadi Salim Date: Thu, 12 Feb 2009 11:43:01 -0500 Subject: libxtables: make iptables and ip6tables use xtables_free_opts The patch modifies xtables_globals to introduce orig_opts and xtables_free_opts() to emulate what free_opts used to do. We also get rid of the copies of free_opts() that iptables and ip6tables keep. Signed-off-by: Jamal Hadi Salim --- xtables.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xtables.c') diff --git a/xtables.c b/xtables.c index bc6a65e5..c8024bf2 100644 --- a/xtables.c +++ b/xtables.c @@ -97,12 +97,11 @@ int xtables_set_params(struct xtables_globals *xtp) return 0; } -void xtables_free_opts(int reset_offset, struct option *original_opts) +void xtables_free_opts(int reset_offset) { - if (xt_params->opts != original_opts) { - if (original_opts) - free(xt_params->opts); - xt_params->opts = original_opts; + if (xt_params->opts != xt_params->orig_opts) { + free(xt_params->opts); + xt_params->opts = xt_params->orig_opts; if (reset_offset) xt_params->option_offset = 0; } -- cgit v1.2.3