lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / isisd / isis_spf_private.h

diff --git a/isisd/isis_spf_private.h b/isisd/isis_spf_private.h
index 664ddc3f29a711d3d6f5a1292e5067e9a5bd2243..3a05df3f1493fd8733c1589adc7f7e21fa1cf570 100644 (file)
--- a/isisd/isis_spf_private.h
+++ b/isisd/isis_spf_private.h
@@ -95,19 +95,19 @@ static unsigned isis_vertex_queue_hash_key(void *vp)
 }
 
 __attribute__((__unused__))
-static int isis_vertex_queue_hash_cmp(const void *a, const void *b)
+static bool isis_vertex_queue_hash_cmp(const void *a, const void *b)
 {
        const struct isis_vertex *va = a, *vb = b;
 
        if (va->type != vb->type)
-               return 0;
+               return false;
 
        if (VTYPE_IP(va->type)) {
                if (prefix_cmp(&va->N.ip.dest, &vb->N.ip.dest))
-                       return 0;
+                       return false;
 
-               return prefix_cmp((struct prefix *)&va->N.ip.src,
-                                 (struct prefix *)&vb->N.ip.src) == 0;
+               return prefix_cmp((const struct prefix *)&va->N.ip.src,
+                                 (const struct prefix *)&vb->N.ip.src) == 0;
        }
 
        return memcmp(va->N.id, vb->N.id, ISIS_SYS_ID_LEN + 1) == 0;
@@ -168,8 +168,8 @@ static void isis_vertex_queue_init(struct isis_vertex_queue *queue,
 __attribute__((__unused__))
 static void isis_vertex_del(struct isis_vertex *vertex)
 {
-       list_delete_and_null(&vertex->Adj_N);
-       list_delete_and_null(&vertex->parents);
+       list_delete(&vertex->Adj_N);
+       list_delete(&vertex->parents);
        if (vertex->firsthops) {
                hash_clean(vertex->firsthops, NULL);
                hash_free(vertex->firsthops);
@@ -212,7 +212,7 @@ static void isis_vertex_queue_free(struct isis_vertex_queue *queue)
                skiplist_free(queue->l.slist);
                queue->l.slist = NULL;
        } else
-               list_delete_and_null(&queue->l.list);
+               list_delete(&queue->l.list);
 }
 
 __attribute__((__unused__))
@@ -238,9 +238,12 @@ static void isis_vertex_queue_append(struct isis_vertex_queue *queue,
 __attribute__((__unused__))
 static struct isis_vertex *isis_vertex_queue_last(struct isis_vertex_queue *queue)
 {
-       assert(!queue->insert_counter);
+       struct listnode *tail;
 
-       return listgetdata(listtail(queue->l.list));
+       assert(!queue->insert_counter);
+       tail = listtail(queue->l.list);
+       assert(tail);
+       return listgetdata(tail);
 }
 
 __attribute__((__unused__))
@@ -318,7 +321,7 @@ static void isis_vertex_id_init(struct isis_vertex *vertex, const void *id,
        } else if (VTYPE_IP(vtype)) {
                memcpy(&vertex->N.ip, id, sizeof(vertex->N.ip));
        } else {
-               flog_err(LIB_ERR_DEVELOPMENT, "Unknown Vertex Type");
+               flog_err(EC_LIB_DEVELOPMENT, "Unknown Vertex Type");
        }
 }