Merge pull request #3356 from opensourcerouting/router-id-loopbacks

[mirror_frr.git] / lib / linklist.c

diff --git a/lib/linklist.c b/lib/linklist.c
index effd384e46d8971e643e74fa2029b34e87499572..3aa7cae8b714c7c8d8eeecb9b7aa426ea05e4dca 100644 (file)
--- a/lib/linklist.c
+++ b/lib/linklist.c
@@ -240,7 +240,7 @@ void list_delete_all_node(struct list *list)
        list->count = 0;
 }
 
-void list_delete_and_null(struct list **list)
+void list_delete(struct list **list)
 {
        assert(*list);
        list_delete_all_node(*list);
@@ -248,11 +248,6 @@ void list_delete_and_null(struct list **list)
        *list = NULL;
 }
 
-void list_delete_original(struct list *list)
-{
-       list_delete_and_null(&list);
-}
-
 struct listnode *listnode_lookup(struct list *list, void *data)
 {
        struct listnode *node;
@@ -318,8 +313,8 @@ void list_sort(struct list *list, int (*cmp)(const void **, const void **))
 
        qsort(items, n, sizeof(void *), realcmp);
 
-       for (unsigned int i = 0; i < n; ++i)
-               listnode_add(list, items[i]);
+       for (unsigned int j = 0; j < n; ++j)
+               listnode_add(list, items[j]);
 
        XFREE(MTYPE_TMP, items);
 }