Merge pull request #767 from donaldsharp/if_update

bgpd, lib, zebra: Fix if_update function to represent what it does

1 files changed, 2 insertions, 6 deletions

diff --git a/lib/if.c b/lib/if.c
index d9b4544271..1d6a8cb529 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -158,7 +158,7 @@ if_create (const char *name, int namelen, vrf_id_t vrf_id)
 
 /* Create new interface structure. */
 void
-if_update (struct interface *ifp, const char *name, int namelen, vrf_id_t vrf_id)
+if_update_to_new_vrf (struct interface *ifp, vrf_id_t vrf_id)
 {
   struct list *intf_list = vrf_iflist_get (vrf_id);
 
@@ -166,10 +166,6 @@ if_update (struct interface *ifp, const char *name, int namelen, vrf_id_t vrf_id
   if (vrf_iflist (ifp->vrf_id))
     listnode_delete (vrf_iflist (ifp->vrf_id), ifp);
 
-  assert (name);
-  assert (namelen <= INTERFACE_NAMSIZ);	/* Need space for '\0' at end. */
-  strncpy (ifp->name, name, namelen);
-  ifp->name[namelen] = '\0';
   ifp->vrf_id = vrf_id;
   if (if_lookup_by_name (ifp->name, vrf_id) == NULL)
     listnode_add_sort (intf_list, ifp);
@@ -453,7 +449,7 @@ if_get_by_name_len (const char *name, size_t namelen, vrf_id_t vrf_id, int vty)
                 }
 	      else
 		{
-		  if_update (ifp, name, namelen, vrf_id);
+		  if_update_to_new_vrf (ifp, vrf_id);
 		  return ifp;
 		}
 	    }