Changeset c028b22 in mainline for kernel/generic/src/adt/hash_table.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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) (6 diffs)

kernel/generic/src/adt/hash_table.c

@@ -62 +62 @@
         ASSERT(max_keys > 0);
         
-        h->entry = (link_t *) malloc(m * sizeof(link_t), 0);
+        h->entry = (list_t *) malloc(m * sizeof(list_t), 0);
         if (!h->entry)
                 panic("Cannot allocate memory for hash table.");
         
-        memsetb(h->entry, m * sizeof(link_t), 0);
+        memsetb(h->entry, m * sizeof(list_t), 0);
         
         for (i = 0; i < m; i++)
@@ -107 +107 @@
 link_t *hash_table_find(hash_table_t *h, sysarg_t key[])
 {
-        link_t *cur;
         size_t chain;
         
@@ -118 +117 @@
         ASSERT(chain < h->entries);
         
-        for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) {
+        list_foreach(h->entry[chain], cur) {
                 if (h->op->compare(key, h->max_keys, cur)) {
                         /*
@@ -141 +140 @@
 {
         size_t chain;
-        link_t *cur;
         
         ASSERT(h);
@@ -149 +147 @@
         ASSERT(keys <= h->max_keys);
         
+        
         if (keys == h->max_keys) {
-        
+                link_t *cur;
+                
                 /*
                  * All keys are known, hash_table_find() can be used to find the entry.
@@ -169 +169 @@
          */
         for (chain = 0; chain < h->entries; chain++) {
-                for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) {
+                link_t *cur;
+                for (cur = h->entry[chain].head.next; cur != &h->entry[chain].head;
+                    cur = cur->next) {
                         if (h->op->compare(key, keys, cur)) {
                                 link_t *hlp;