summaryrefslogtreecommitdiff
path: root/zebra
diff options
context:
space:
mode:
authorPaul Jakma <paul@quagga.net>2011-04-11 16:33:20 +0100
committerPaul Jakma <paul@quagga.net>2011-04-13 15:13:33 +0100
commit8dd1a8daae0b15065d54c46f82d44d21aa7a2320 (patch)
treeb14e8ed07f1a6ee97de84262bb85cd0a50f9c250 /zebra
parentfdbc8e77c88f751924299d0bc752371d5cc31116 (diff)
zebra: trivial warning fix
* zebra_routemap.c: (route_set_src) get rid of the dummy family variable.
Diffstat (limited to 'zebra')
-rw-r--r--zebra/zebra_routemap.c11
1 files changed, 4 insertions, 7 deletions
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;