Changeset 00b7fc8 in mainline for uspace/lib/c/generic/adt/list.c

Timestamp:

2019-02-01T22:32:38Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Parents:

f959a20f

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 21:46:05)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 22:32:38)

Message:

wip

File:

• uspace/lib/c/generic/adt/list.c (modified) (2 diffs)

uspace/lib/c/generic/adt/list.c

@@ -55 +55 @@
 bool list_member(const link_t *link, const list_t *list)
 {
-        bool found = false;
-        link_t *hlp = list->head.next;
+        if (list_empty(list))
+                return false;
 
-        while (hlp != &list->head) {
-                if (hlp == link) {
-                        found = true;
-                        break;
-                }
-                hlp = hlp->next;
+        link_t *hlp = list->__adt_list_head.__adt_link_next;
+
+        while (hlp != &list->__adt_list_head) {
+                if (hlp == link)
+                        return true;
+                hlp = hlp->__adt_link_next;
         }
 
-        return found;
+        return false;
 }
 
@@ -83 +83 @@
 
         /* Attach list to destination. */
-        list->head.next->prev = pos;
-        list->head.prev->next = pos->next;
+        list->__adt_list_head.__adt_link_next->__adt_link_prev = pos;
+        list->__adt_list_head.__adt_link_prev->__adt_link_next = pos->__adt_link_next;
 
         /* Link destination list to the added list. */
-        pos->next->prev = list->head.prev;
-        pos->next = list->head.next;
+        pos->__adt_link_next->__adt_link_prev = list->__adt_list_head.__adt_link_prev;
+        pos->__adt_link_next = list->__adt_list_head.__adt_link_next;
 
         list_initialize(list);