Changeset 0773396 in mainline for uspace/lib/c/generic/adt/hash_table.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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:

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

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

@@ -227 +227 @@
         
         /* Check for duplicates. */
-        list_foreach(h->bucket[idx], cur) {
+        list_foreach(h->bucket[idx], link, ht_link_t, cur_link) {
                 /* 
                  * We could filter out items using their hashes first, but 
                  * calling equal() might very well be just as fast.
                  */
-                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
                 if (h->op->equal(cur_link, item))
                         return false;
@@ -258 +257 @@
         size_t idx = h->op->key_hash(key) % h->bucket_cnt;
 
-        list_foreach(h->bucket[idx], cur) {
-                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+        list_foreach(h->bucket[idx], link, ht_link_t, cur_link) {
                 /* 
                  * Is this is the item we are looking for? We could have first