len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 05:35:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve the implementation of a couple linked list routines.

Browse source 
ll_insert_next() and ll_remove_next() can be done more elegantly
by adding a level of indirection to reference the 'next' pointer.

Change-Id: If3ab2bc2a659b517c793749cfa9088938ae08d0d
This commit is contained in:
Michael Sevakis 2017-01-07 07:14:43 -05:00
parent 5c6ccb43b5
commit 077e20664c
1 changed files with 14 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

51
firmware/common/linked_list.c
View file

@ -60,26 +60,14 @@ void ll_init(struct ll_head *list)
void ll_insert_next(struct ll_head *list, struct ll_node *node, void ll_insert_next(struct ll_head *list, struct ll_node *node,
struct ll_node *newnode) struct ll_node *newnode)
{ {
if (node == NULL) struct ll_node **nodep = node != NULL ? &node->next : &list->head;
{ struct ll_node *next = *nodep;
node = list->head;
newnode->next = node; newnode->next = next;
list->head = newnode; *nodep = newnode;
if (node == NULL) if (next == NULL)
list->tail = node; list->tail = newnode;
}
else
{
struct ll_node *next = node->next;
newnode->next = next;
node->next = newnode;
if (next == NULL)
list->tail = newnode;
}
} }
/** /**
@ -117,27 +105,16 @@ void ll_insert_last(struct ll_head *list, struct ll_node *node)
*/ */
void ll_remove_next(struct ll_head *list, struct ll_node *node) void ll_remove_next(struct ll_head *list, struct ll_node *node)
{ {
if (node == NULL) struct ll_node **nodep = node != NULL ? &node->next : &list->head;
struct ll_node *next = *nodep;
if (next != NULL)
{ {
node = list->head->next; next = next->next;
*nodep = next;
list->head = node; if (next == NULL)
list->tail = node;
if (node == NULL)
list->tail = NULL;
}
else
{
struct ll_node *next = node->next;
if (next != NULL)
{
next = next->next;
node->next = next;
if (!next)
list->tail = node;
}
} }
} }