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

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

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