ospfd: ospf_nbr_nbma_lookup_next always returns NULL

The calling function of ospf_nbr_nbma_lookup_next calls
this function and then immediately returns when it
gets the NULL.  Just cleanup a bit more code.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 66dd9c7ca4ac9dbbf4d650a1aa7f7c0b70efa3ae..3f4ca44b0504b187fc481bf933d5074cb35366ab 100644 (file)
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -1236,7 +1236,6 @@ static struct ospf_nbr_nbma *ospfHostLookup(struct variable *v, oid *name,
                                            size_t *length,
                                            struct in_addr *addr, int exact)
 {
-       int len;
        struct ospf_nbr_nbma *nbr_nbma;
        struct ospf *ospf;
 
@@ -1257,29 +1256,9 @@ static struct ospf_nbr_nbma *ospfHostLookup(struct variable *v, oid *name,
 
                nbr_nbma = ospf_nbr_nbma_lookup(ospf, *addr);
 
-               return nbr_nbma;
-       } else {
-               len = *length - v->namelen;
-               if (len > 4)
-                       len = 4;
-
-               oid2in_addr(name + v->namelen, len, addr);
-
-               nbr_nbma =
-                       ospf_nbr_nbma_lookup_next(ospf, addr, len == 0 ? 1 : 0);
-
-               if (nbr_nbma == NULL)
-                       return NULL;
-
-               oid_copy_addr(name + v->namelen, addr, IN_ADDR_SIZE);
-
-               /* Set TOS 0. */
-               name[v->namelen + IN_ADDR_SIZE] = 0;
-
-               *length = v->namelen + IN_ADDR_SIZE + 1;
-
                return nbr_nbma;
        }
+
        return NULL;
 }
 

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index dfb1b44e34bb6063dc53584a89e023bc11853bc7..04397d50a5798266474ccd13ec8fac595153dc4f 100644 (file)
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -1981,15 +1981,6 @@ struct ospf_nbr_nbma *ospf_nbr_nbma_lookup(struct ospf *ospf,
        return NULL;
 }
 
-struct ospf_nbr_nbma *ospf_nbr_nbma_lookup_next(struct ospf *ospf,
-                                               struct in_addr *addr, int first)
-{
-       if (ospf == NULL)
-               return NULL;
-
-       return NULL;
-}
-
 int ospf_nbr_nbma_set(struct ospf *ospf, struct in_addr nbr_addr)
 {
        struct ospf_nbr_nbma *nbr_nbma;

diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h
index 9d5aa6a4f928e5a8cc20556c648a486761f8b98c..954a469b68d4e92dfda1ec16d916b1c2f7250035 100644 (file)
--- a/ospfd/ospfd.h
+++ b/ospfd/ospfd.h
@@ -694,8 +694,6 @@ extern void ospf_terminate(void);
 extern void ospf_nbr_nbma_if_update(struct ospf *, struct ospf_interface *);
 extern struct ospf_nbr_nbma *ospf_nbr_nbma_lookup(struct ospf *,
                                                  struct in_addr);
-extern struct ospf_nbr_nbma *ospf_nbr_nbma_lookup_next(struct ospf *,
-                                                      struct in_addr *, int);
 extern int ospf_oi_count(struct interface *);
 
 extern struct ospf_area *ospf_area_new(struct ospf *ospf,