Changeset feeac0d in mainline for kernel/generic/src/adt

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

Location:

kernel/generic/src/adt

Files:

• btree.c (modified) (1 diff)
• hash_table.c (modified) (2 diffs)
• list.c (modified) (1 diff)

kernel/generic/src/adt/btree.c

@@ -1031 +1031 @@
         
         printf("Printing list of leaves:\n");
-        list_foreach(t->leaf_list, cur) {
-                btree_node_t *node;
-                
-                node = list_get_instance(cur, btree_node_t, leaf_link);
-                
+        list_foreach(t->leaf_list, leaf_link, btree_node_t, node) {
                 ASSERT(node);
                 

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

kernel/generic/src/adt/list.c

@@ -101 +101 @@
         unsigned int count = 0;
         
-        list_foreach(*list, link) {
+        link_t *link = list_first(list);
+        while (link != NULL) {
                 count++;
+                link = list_next(link, list);
         }