Changes in kernel/generic/src/adt/hash_table.c [b72efe8:96b02eb9] in mainline

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 = (list_t *) malloc(m * sizeof(list_t), 0);
+        h->entry = (link_t *) malloc(m * sizeof(link_t), 0);
         if (!h->entry)
                 panic("Cannot allocate memory for hash table.");
         
-        memsetb(h->entry, m * sizeof(list_t), 0);
+        memsetb(h->entry, m * sizeof(link_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;
         
@@ -117 +118 @@
         ASSERT(chain < h->entries);
         
-        list_foreach(h->entry[chain], cur) {
+        for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) {
                 if (h->op->compare(key, h->max_keys, cur)) {
                         /*
@@ -140 +141 @@
 {
         size_t chain;
+        link_t *cur;
         
         ASSERT(h);
@@ -147 +149 @@
         ASSERT(keys <= h->max_keys);
         
+        if (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++) {
-                link_t *cur;
-                for (cur = h->entry[chain].head.next; cur != &h->entry[chain].head;
-                    cur = cur->next) {
+                for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) {
                         if (h->op->compare(key, keys, cur)) {
                                 link_t *hlp;