Changeset f959a20f in mainline for uspace/lib/c

Timestamp:

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

Author:

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

Children:

00b7fc8

Parents:

1a37496

git-author:

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

git-committer:

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

Message:

Avoid directly using .head/.next/.prev of list_t/link_t

Use existing constructs from <adt/list.h> instead.

Location:

uspace/lib/c

Files:

• generic/adt/hash_table.c (modified) (1 diff)
• generic/thread/fibril.c (modified) (1 diff)
• include/ipc/devman.h (modified) (1 diff)

uspace/lib/c/generic/adt/hash_table.c

@@ -273 +273 @@
 
         size_t idx = h->op->hash(item) % h->bucket_cnt;
+        list_t *list = &h->bucket[idx];
 
         /* Traverse the circular list until we reach the starting item again. */
-        for (link_t *cur = item->link.next; cur != &first->link;
-            cur = cur->next) {
-                assert(cur);
-
-                if (cur == &h->bucket[idx].head)
-                        continue;
+        for (link_t *cur = list_next(&item->link, list); cur != &first->link;
+            cur = list_next(cur, list)) {
+
+                if (!cur)
+                        cur = list_first(list);
 
                 ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);

uspace/lib/c/generic/thread/fibril.c

@@ -601 +601 @@
         assert(timeout);
 
-        link_t *tmp = timeout_list.head.next;
-        while (tmp != &timeout_list.head) {
-                _timeout_t *cur = list_get_instance(tmp, _timeout_t, link);
-
-                if (ts_gteq(&cur->expires, &timeout->expires))
-                        break;
-
-                tmp = tmp->next;
-        }
-
-        list_insert_before(&timeout->link, tmp);
+        list_foreach(timeout_list, link, _timeout_t, cur) {
+                if (ts_gteq(&cur->expires, &timeout->expires)) {
+                        list_insert_before(&timeout->link, &cur->link);
+                        return;
+                }
+        }
+
+        list_append(&timeout->link, &timeout_list);
 }
 

uspace/lib/c/include/ipc/devman.h

@@ -108 +108 @@
 static inline void add_match_id(match_id_list_t *ids, match_id_t *id)
 {
-        match_id_t *mid = NULL;
-        link_t *link = ids->ids.head.next;
-
-        while (link != &ids->ids.head) {
-                mid = list_get_instance(link, match_id_t, link);
+        list_foreach(ids->ids, link, match_id_t, mid) {
                 if (mid->score < id->score) {
-                        break;
+                        list_insert_before(&id->link, &mid->link);
+                        return;
                 }
-                link = link->next;
         }
 
-        list_insert_before(&id->link, link);
+        list_append(&id->link, &ids->ids);
 }