From bd9438420d92c41a5cf20a53b7a18d3ddea4216d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 20 Jan 2008 13:38:08 +0000 Subject: rename overlapping function names Rename overlapping function names. Signed-off-by: Jan Engelhardt --- include/iptables.h | 5 ----- include/xtables.h | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/iptables.h b/include/iptables.h index 7c5c0f7c..f39410c0 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -24,11 +24,6 @@ extern int line; extern void register_match(struct iptables_match *me); extern void register_target(struct iptables_target *me); -extern struct in_addr *dotted_to_addr(const char *dotted); -extern struct in_addr *dotted_to_mask(const char *dotted); - -extern void parse_hostnetworkmask(const char *name, struct in_addr **addrpp, - struct in_addr *maskp, unsigned int *naddrs); extern u_int16_t parse_protocol(const char *s); extern int do_command(int argc, char *argv[], char **table, diff --git a/include/xtables.h b/include/xtables.h index 5fa34846..1e45a1a0 100644 --- a/include/xtables.h +++ b/include/xtables.h @@ -239,10 +239,17 @@ extern const char *program_name, *program_version; extern const char *ipaddr_to_numeric(const struct in_addr *); extern const char *ipaddr_to_anyname(const struct in_addr *); extern const char *ipmask_to_numeric(const struct in_addr *); +extern struct in_addr *numeric_to_ipaddr(const char *); +extern struct in_addr *numeric_to_ipmask(const char *); +extern void ipparse_hostnetworkmask(const char *, struct in_addr **, + struct in_addr *, unsigned int *); +extern struct in6_addr *numeric_to_ip6addr(const char *); extern const char *ip6addr_to_numeric(const struct in6_addr *); extern const char *ip6addr_to_anyname(const struct in6_addr *); extern const char *ip6mask_to_numeric(const struct in6_addr *); +extern void ip6parse_hostnetworkmask(const char *, struct in6_addr **, + struct in6_addr *, unsigned int *); #ifdef NO_SHARED_LIBS # ifdef _INIT -- cgit v1.2.3