[ripngd] CID #72, remove unneeded NULL check

2006-05-11 Paul Jakma <paul.jakma@sun.com>

	* ripng_interface.c: (ripng_interface_address_add) Remove
	  unneeded NULL check, Coverity CID #72.

diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index ff284f1f270b93fff9dd80970e5dbbc0f5172ce2..1bafb84aa9ecfd44b89fe0ad0bcfb4f11596abeb 100644 (file)
--- a/ripngd/ChangeLog
+++ b/ripngd/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11 Paul Jakma <paul.jakma@sun.com>
+
+       * ripng_interface.c: (ripng_interface_address_add) Remove
+         unneeded NULL check, Coverity CID #72.
+
 2006-05-08 Paul Jakma <paul.jakma@sun.com>
 
        * ripng_routemap.c: (route_set_ipv6_nexthop_local_compile) bug

diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index 52a1fe2409038d45ad3442c5614d150105b8cdd8..140e3bef615d44bdd10e8a4610172cc393a3acea 100644 (file)
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -435,6 +435,8 @@ ripng_interface_address_add (int command, struct zclient *zclient,
 
   if (p->family == AF_INET6)
     {
+      struct ripng_interface *ri = c->ifp->info;
+      
       if (IS_RIPNG_DEBUG_ZEBRA)
        zlog_debug ("RIPng connected address %s/%d add",
                   inet6_ntoa(p->u.prefix6),
@@ -444,19 +446,15 @@ ripng_interface_address_add (int command, struct zclient *zclient,
       ripng_apply_address_add(c);
 
       /* Let's try once again whether the interface could be activated */
-      if (c->ifp) {
-        struct ripng_interface *ri = c->ifp->info;
-
-        if (!ri->running) {
-          /* Check if this interface is RIP enabled or not.*/
-          ripng_enable_apply (c->ifp);
+      if (!ri->running) {
+        /* Check if this interface is RIP enabled or not.*/
+        ripng_enable_apply (c->ifp);
 
-          /* Apply distribute list to the interface. */
-          ripng_distribute_update_interface (c->ifp);
+        /* Apply distribute list to the interface. */
+        ripng_distribute_update_interface (c->ifp);
 
-          /* Check interface routemap. */
-          ripng_if_rmap_update_interface (c->ifp);
-        }
+        /* Check interface routemap. */
+        ripng_if_rmap_update_interface (c->ifp);
       }
 
     }