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 --- include/xtables.h.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/xtables.h.in b/include/xtables.h.in index 5af52071..a884343b 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -187,6 +187,7 @@ struct xtables_globals { unsigned int option_offset; const char *program_name, *program_version; + struct option *orig_opts; struct option *opts; void (*exit_err)(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3))); }; @@ -205,7 +206,7 @@ extern int xtables_insmod(const char *, const char *, bool); extern int xtables_load_ko(const char *, bool); extern int xtables_set_params(struct xtables_globals *xtp); extern void xtables_set_revision(char *name, u_int8_t revision); -void xtables_free_opts(int reset_offset, struct option *original_opts); +extern void xtables_free_opts(int reset_offset); extern struct xtables_match *xtables_find_match(const char *name, enum xtables_tryload, struct xtables_rule_match **match); -- cgit v1.2.3