From 1cc09188079a64dc8b733f198c959cfb441e6e20 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 2 Aug 2018 17:05:16 +0200 Subject: xshared: Consolidate parse_counters() Move this helper function into xshared. While being at it, drop the need for temporary variables and take over null pointer tolerance from the implementation in iptables-xml.c. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- iptables/iptables-xml.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'iptables/iptables-xml.c') diff --git a/iptables/iptables-xml.c b/iptables/iptables-xml.c index a1b09f3a..8ba45d55 100644 --- a/iptables/iptables-xml.c +++ b/iptables/iptables-xml.c @@ -50,22 +50,6 @@ print_usage(const char *name, const char *version) exit(1); } -static int -parse_counters(char *string, struct xt_counters *ctr) -{ - __u64 *pcnt, *bcnt; - - if (string != NULL) { - pcnt = &ctr->pcnt; - bcnt = &ctr->bcnt; - return (sscanf - (string, "[%llu:%llu]", - (unsigned long long *)pcnt, - (unsigned long long *)bcnt) == 2); - } else - return (0 == 2); -} - /* global new argv and argc */ static char *newargv[255]; static unsigned int newargc; -- cgit v1.2.3