eigrpd: eigrp usage of uint32_t to struct in_addr for router_id data

[mirror_frr.git] / ospf6d / ospf6_spf.c

diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 5b6691e6bf1b4039f9724a2130d019d18a59cd68..2d271c1dabbfac204ccf16b2e1d52ec6a725b424 100644 (file)
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -30,6 +30,7 @@
 #include "pqueue.h"
 #include "linklist.h"
 #include "thread.h"
+#include "lib_errors.h"
 
 #include "ospf6_lsa.h"
 #include "ospf6_lsdb.h"
@@ -157,8 +158,8 @@ static struct ospf6_vertex *ospf6_vertex_create(struct ospf6_lsa *lsa)
 
 static void ospf6_vertex_delete(struct ospf6_vertex *v)
 {
-       list_delete_and_null(&v->nh_list);
-       list_delete_and_null(&v->child_list);
+       list_delete(&v->nh_list);
+       list_delete(&v->child_list);
        XFREE(MTYPE_OSPF6_VERTEX, v);
 }
 
@@ -272,7 +273,8 @@ static void ospf6_nexthop_calc(struct ospf6_vertex *w, struct ospf6_vertex *v,
        ifindex = (VERTEX_IS_TYPE(NETWORK, v) ? ospf6_spf_get_ifindex_from_nh(v)
                                              : ROUTER_LSDESC_GET_IFID(lsdesc));
        if (ifindex == 0) {
-               zlog_err("No nexthop ifindex at vertex %s", v->name);
+               flog_err(EC_LIB_DEVELOPMENT, "No nexthop ifindex at vertex %s",
+                        v->name);
                return;
        }
 
@@ -1012,16 +1014,10 @@ struct ospf6_lsa *ospf6_create_single_router_lsa(struct ospf6_area *area,
 
        /* Allocate memory for this LSA */
        new_header = XMALLOC(MTYPE_OSPF6_LSA_HEADER, total_lsa_length);
-       if (!new_header)
-               return NULL;
 
        /* LSA information structure */
        lsa = (struct ospf6_lsa *)XCALLOC(MTYPE_OSPF6_LSA,
                                          sizeof(struct ospf6_lsa));
-       if (!lsa) {
-               free(new_header);
-               return NULL;
-       }
 
        lsa->header = (struct ospf6_lsa_header *)new_header;