Changeset f959a20f in mainline for uspace/lib/c/generic/adt/hash_table.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.

File:

• uspace/lib/c/generic/adt/hash_table.c (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);