From f17b65213712f324314c58866c4f4f8ed9c95dc7 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Mon, 11 Apr 2011 16:33:20 +0100 Subject: zebra: trivial warning fix * zebra_routemap.c: (route_set_src) get rid of the dummy family variable. --- zebra/zebra_routemap.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'zebra') diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 808dcf74..b3111b8e 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -642,17 +642,14 @@ route_set_src (void *rule, struct prefix *prefix, static void * route_set_src_compile (const char *arg) { - sa_family_t family; union g_addr src, *psrc; - if (inet_pton(AF_INET, arg, &src.ipv4) > 0) - family = AF_INET; + if (inet_pton(AF_INET, arg, &src.ipv4) != 1 #ifdef HAVE_IPV6 - else if (inet_pton(AF_INET6, arg, &src.ipv6) > 0) - family = AF_INET6; + && inet_pton(AF_INET6, arg, &src.ipv6) != 1 #endif /* HAVE_IPV6 */ - else - return NULL; + ) + return NULL; psrc = XMALLOC (MTYPE_ROUTE_MAP_COMPILED, sizeof (union g_addr)); *psrc = src; -- cgit v1.2.1