From 236c10d33b1027d83caf6127336b924e81d32135 Mon Sep 17 00:00:00 2001 From: Holger Eitzenberger Date: Tue, 1 Feb 2011 17:30:57 +0100 Subject: ipset: pass ipset_arg argument pointer Signed-off-by: Holger Eitzenberger --- lib/parse.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/parse.c b/lib/parse.c index e998df5..cd1ad32 100644 --- a/lib/parse.c +++ b/lib/parse.c @@ -1416,15 +1416,14 @@ ipset_parse_ignored(struct ipset_session *session, */ int ipset_call_parser(struct ipset_session *session, - ipset_parsefn parse, const char *optstr, - enum ipset_opt opt, const char *str) + const struct ipset_arg *arg, + const char *str) { if (ipset_data_flags_test(ipset_session_data(session), - IPSET_FLAG(opt))) - syntax_err("%s already specified", optstr); + IPSET_FLAG(arg->opt))) + syntax_err("%s already specified", arg->name[0]); - return parse(session, opt, parse == ipset_parse_ignored - ? optstr : str); + return arg->parse(session, arg->opt, str); } #define parse_elem(s, t, d, str) \ -- cgit v1.2.3