From: Paul Jakma <paul@quagga.net>
Date: Mon, 11 Apr 2011 15:33:20 +0000 (+0100)
Subject: zebra: trivial warning fix
X-Git-Tag: frr-2.0-rc1~1918^2~73
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f17b65213712f324314c58866c4f4f8ed9c95dc7;p=mirror%2Ffrr.git

zebra: trivial warning fix

* zebra_routemap.c: (route_set_src) get rid of the dummy family variable.
---

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 808dcf7459..b3111b8e63 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;