lib: Refactor XX_name_len away

We had two functions XXX_name and XXX_name_len
that both did the same thing.  Remove the
XXX_rename_len functions.

Ticket: CM-10338
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Radhika Mahankali <radhika@cumulusnetworks.com>

diff --git a/lib/if.c b/lib/if.c
index 420215d8b7894c5f43bfb2f1ae84b9136a92f463..418477efead2893970e146734e6427d0666ed4f0 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -849,7 +849,7 @@ DEFUN (vrf,
       return CMD_WARNING;
     }
 
-  vrfp = vrf_get_by_name_len (argv[0], sl);
+  vrfp = vrf_get_by_name (argv[0]);
 
   vty->index = vrfp;
   vty->node = VRF_NODE;

diff --git a/lib/vrf.c b/lib/vrf.c
index 4665acbf5b3e81ea8e520d5a3c31fc0dd3e4d510..bb986bca454a586d0bf78a1e5fd8b5c32ae5e72c 100644 (file)
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -70,23 +70,6 @@ vrf_list_lookup_by_name (const char *name)
   return NULL;
 }
 
-struct vrf *
-vrf_list_lookup_by_name_len (const char *name, size_t namelen)
-{
-  struct listnode *node;
-  struct vrf *vrfp;
-
-  if (namelen > INTERFACE_NAMSIZ)
-    return NULL;
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_list, node, vrfp))
-    {
-      if (!memcmp(name, vrfp->name, namelen) && (vrfp->name[namelen] == '\0'))
-       return vrfp;
-    }
-  return NULL;
-}
-
 /* Create new interface structure. */
 struct vrf *
 vrf_create (const char *name, size_t namelen)
@@ -113,15 +96,6 @@ vrf_create (const char *name, size_t namelen)
   return vrfp;
 }
 
-struct vrf *
-vrf_get_by_name_len (const char *name, size_t namelen)
-{
-  struct vrf *vrfp;
-
-  return ((vrfp = vrf_list_lookup_by_name_len (name, namelen)) != NULL) ? vrfp :
-          vrf_create (name, namelen);
-}
-
 struct vrf *
 vrf_get_by_name (const char *name)
 {

diff --git a/lib/vrf.h b/lib/vrf.h
index b2493020b7ab441c68676c2184205405b8a7cd2e..4e55ec162cf152a4fd930552ac708ab3db3a0ea7 100644 (file)
--- a/lib/vrf.h
+++ b/lib/vrf.h
@@ -109,9 +109,7 @@ typedef void *              vrf_iter_t;
 extern struct vrf *vrf_lookup (vrf_id_t);
 extern struct vrf *vrf_lookup_by_name (const char *);
 extern struct vrf *vrf_list_lookup_by_name (const char *);
-extern struct vrf *vrf_list_lookup_by_name_len (const char *, size_t);
 extern struct vrf *vrf_get_by_name (const char *);
-extern struct vrf *vrf_get_by_name_len (const char *, size_t);
 extern struct vrf *vrf_get (vrf_id_t, const char *);
 extern struct vrf *vrf_create (const char *, size_t);
 extern void vrf_delete (struct vrf *);