i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DoublyLinkedQueue: Rework Remove() function.

Browse Source 
Equivalent to the changes done to DoublyLinkedList
(in 904e9f5512305dbc0eed9146e8a0b2d597269b71.)
This commit is contained in:
Augustin Cavalier
2023-08-04 13:25:56 -04:00
parent 74662b662d
commit 9b28ebf997
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/DoublyLinkedQueue.h
+17 -11
View File
@@ -226,18 +226,24 @@ DOUBLY_LINKED_LIST_TEMPLATE_LIST
void void
DOUBLY_LINKED_QUEUE_CLASS_NAME::Remove(Element *element) DOUBLY_LINKED_QUEUE_CLASS_NAME::Remove(Element *element)
{ {
if (element) { if (element == NULL)
Link *elLink = sGetLink(element); return;
if (elLink->previous)
sGetLink(elLink->previous)->next = elLink->next;
else
fFirst = elLink->next;
if (elLink->next)
sGetLink(elLink->next)->previous = elLink->previous;
elLink->previous = NULL; #if DEBUG_DOUBLY_LINKED_LIST
elLink->next = NULL; ASSERT_PRINT(fFirst != NULL,
} "queue: %p, element: %p\n", this, element);
#endif
Link *elLink = sGetLink(element);
if (element == fFirst)
fFirst = elLink->next;
else
sGetLink(elLink->previous)->next = elLink->next;
if (elLink->next)
sGetLink(elLink->next)->previous = elLink->previous;
elLink->next = elLink->previous = NULL;
} }
// Swap // Swap