Changeset 3f03199 in mainline for kernel/generic/src/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:

• kernel/generic/src/adt/hash_table.c (modified) (2 diffs)

kernel/generic/src/adt/hash_table.c

@@ -117 +117 @@
         ASSERT(chain < h->entries);
         
-        list_foreach(h->entry[chain], cur) {
+        link_t *cur = list_first(&h->entry[chain]);
+        while (cur != NULL) {
                 if (h->op->compare(key, h->max_keys, cur)) {
                         /*
@@ -124 +125 @@
                         return cur;
                 }
+                cur = list_next(cur, &h->entry[chain]);
         }