diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2016-07-28 17:23:46 +0200 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-07-28 13:27:47 +0200 |
commit | a8fd82028158f8e811e214fec0185cf6cdfdb9cb (patch) | |
tree | 75a3b1ace1cf15db15f286492f22b752ce4a40a4 /lib/linklist.c | |
parent | *: snmp: add a load of "static" specifiers (diff) | |
download | frr-a8fd82028158f8e811e214fec0185cf6cdfdb9cb.tar.xz frr-a8fd82028158f8e811e214fec0185cf6cdfdb9cb.zip |
lib: linklist: clean up insert-before/after dups
- list_add_node_next was in fact unused
- list_add_node_prev performs a subset of listnode_add_before and
its only use in isisd replaced with that.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/linklist.c')
-rw-r--r-- | lib/linklist.c | 49 |
1 files changed, 2 insertions, 47 deletions
diff --git a/lib/linklist.c b/lib/linklist.c index 8b6a85282..d27a2da84 100644 --- a/lib/linklist.c +++ b/lib/linklist.c @@ -122,7 +122,7 @@ listnode_add_sort (struct list *list, void *val) list->count++; } -void +struct listnode * listnode_add_after (struct list *list, struct listnode *pp, void *val) { struct listnode *nn; @@ -157,6 +157,7 @@ listnode_add_after (struct list *list, struct listnode *pp, void *val) pp->next = nn; } list->count++; + return nn; } struct listnode * @@ -306,52 +307,6 @@ list_delete_node (struct list *list, struct listnode *node) /* ospf_spf.c */ void -list_add_node_prev (struct list *list, struct listnode *current, void *val) -{ - struct listnode *node; - - assert (val != NULL); - - node = listnode_new (); - node->next = current; - node->data = val; - - if (current->prev == NULL) - list->head = node; - else - current->prev->next = node; - - node->prev = current->prev; - current->prev = node; - - list->count++; -} - -/* ospf_spf.c */ -void -list_add_node_next (struct list *list, struct listnode *current, void *val) -{ - struct listnode *node; - - assert (val != NULL); - - node = listnode_new (); - node->prev = current; - node->data = val; - - if (current->next == NULL) - list->tail = node; - else - current->next->prev = node; - - node->next = current->next; - current->next = node; - - list->count++; -} - -/* ospf_spf.c */ -void list_add_list (struct list *l, struct list *m) { struct listnode *n; |