From 6e2e169eb66b63d2991e1c7ada931e3cdb0ced32 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 16 Mar 2017 16:55:01 +0900 Subject: iptables: remove duplicated argument parsing code 1. Factor out repeated code to a new xs_has_arg function. 2. Add a new parse_wait_time option to parse the value of -w. 3. Make parse_wait_interval take argc and argv so its callers can be simpler. Signed-off-by: Lorenzo Colitti Signed-off-by: Pablo Neira Ayuso --- iptables/xshared.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'iptables/xshared.h') diff --git a/iptables/xshared.h b/iptables/xshared.h index 18b1cf37..d8a697ae 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -88,7 +88,9 @@ extern void xs_init_target(struct xtables_target *); extern void xs_init_match(struct xtables_match *); bool xtables_lock(int wait, struct timeval *wait_interval); -void parse_wait_interval(const char *str, struct timeval *wait_interval); +int parse_wait_time(int argc, char *argv[]); +void parse_wait_interval(int argc, char *argv[], struct timeval *wait_interval); +bool xs_has_arg(int argc, char *argv[]); extern const struct xtables_afinfo *afinfo; -- cgit v1.2.3