Changeset 14a60e3 in mainline for kernel/generic/include/adt/list.h

Timestamp:

2011-09-09T15:06:40Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c014d1

Parents:

359f429

Message:

port uspace list improvements to kernel

File:

• kernel/generic/include/adt/list.h (modified) (2 diffs)

kernel/generic/include/adt/list.h

@@ -72 +72 @@
 
 #define assert_link_not_used(link) \
-        ASSERT((link)->prev == NULL && (link)->next == NULL)
+        ASSERT(((link)->prev == NULL) && ((link)->next == NULL))
 
 /** Initialize doubly-linked circular list link
@@ -158 +158 @@
 NO_TRACE static inline void list_remove(link_t *link)
 {
-        link->next->prev = link->prev;
-        link->prev->next = link->next;
+        if ((link->prev != NULL) && (link->next != NULL)) {
+                link->next->prev = link->prev;
+                link->prev->next = link->next;
+        }
+        
         link_initialize(link);
 }