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

• 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]);
         }