summaryrefslogtreecommitdiffstats
path: root/lib/parse.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/parse.c')
-rw-r--r--lib/parse.c34
1 files changed, 3 insertions, 31 deletions
diff --git a/lib/parse.c b/lib/parse.c
index 4963d51..a88b9e2 100644
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -1396,11 +1396,11 @@ ipset_parse_iptimeout(struct ipset_session *session,
#define check_setname(str, saved) \
do { \
if (strlen(str) > IPSET_MAXNAMELEN - 1) { \
- int err; \
- err = syntax_err("setname '%s' is longer than %u characters",\
+ int __err; \
+ __err = syntax_err("setname '%s' is longer than %u characters",\
str, IPSET_MAXNAMELEN - 1); \
free(saved); \
- return err; \
+ return __err; \
} \
} while (0)
@@ -1876,34 +1876,6 @@ ipset_parse_skbprio(struct ipset_session *session,
}
/**
- * ipset_parse_output - parse output format name
- * @session: session structure
- * @opt: option kind of the data
- * @str: string to parse
- *
- * Parse output format names and set session mode.
- * The value is stored in the session.
- *
- * Returns 0 on success or a negative error code.
- */
-int
-ipset_parse_output(struct ipset_session *session,
- int opt UNUSED, const char *str)
-{
- assert(session);
- assert(str);
-
- if (STREQ(str, "plain"))
- return ipset_session_output(session, IPSET_LIST_PLAIN);
- else if (STREQ(str, "xml"))
- return ipset_session_output(session, IPSET_LIST_XML);
- else if (STREQ(str, "save"))
- return ipset_session_output(session, IPSET_LIST_SAVE);
-
- return syntax_err("unknown output mode '%s'", str);
-}
-
-/**
* ipset_parse_ignored - "parse" ignored option
* @session: session structure
* @opt: option kind of the data