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

Timestamp:

2011-09-09T18:22:33Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

40a2af3

Parents:

980671e7 (diff), 5da7199 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

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);
 }