From 2f9be9412597f21517560fb14dcccbeadc23ba37 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Sun, 20 Jan 2008 13:38:08 +0000 Subject: [PATCH]: rename overlapping function names Rename overlapping function names. Signed-off-by: Jan Engelhardt --- extensions/libip6t_policy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'extensions/libip6t_policy.c') diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index bdd9836..1ecd66e 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -128,8 +128,6 @@ mask_to_numeric(const struct in6_addr *addrp) /* These should be in include/ip6tables.h... */ extern u_int16_t parse_protocol(const char *s); -extern void parse_hostnetworkmask(const char *name, struct in6_addr **addrpp, - struct in6_addr *maskp, unsigned int *naddrs); /* End duplicated code from ip6tables.c */ @@ -223,7 +221,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --tunnel-src option"); - parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); + ip6parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); if (naddr > 1) exit_error(PARAMETER_PROBLEM, "policy match: name resolves to multiple IPs"); @@ -238,7 +236,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --tunnel-dst option"); - parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); + ip6parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); if (naddr > 1) exit_error(PARAMETER_PROBLEM, "policy match: name resolves to multiple IPs"); -- cgit v1.2.3