Changes in uspace/lib/c/generic/adt/hash_table.c [b72efe8:e1da7ec] in mainline

File:

• uspace/lib/c/generic/adt/hash_table.c (modified) (6 diffs)

uspace/lib/c/generic/adt/hash_table.c

@@ -54 +54 @@
  *
  */
-bool hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys,
+int hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys,
     hash_table_operations_t *op)
 {
@@ -61 +61 @@
         assert(max_keys > 0);
         
-        h->entry = malloc(m * sizeof(list_t));
+        h->entry = malloc(m * sizeof(link_t));
         if (!h->entry)
                 return false;
         
-        memset((void *) h->entry, 0,  m * sizeof(list_t));
+        memset((void *) h->entry, 0,  m * sizeof(link_t));
         
         hash_count_t i;
@@ -123 +123 @@
         assert(chain < h->entries);
         
-        list_foreach(h->entry[chain], cur) {
+        link_t *cur;
+        for (cur = h->entry[chain].next; cur != &h->entry[chain];
+            cur = cur->next) {
                 if (h->op->compare(key, h->max_keys, cur)) {
                         /*
@@ -151 +153 @@
         assert(keys <= h->max_keys);
         
+        link_t *cur;
+        
         if (keys == h->max_keys) {
-                link_t *cur;
-                
                 /*
                  * All keys are known, hash_table_find() can be used to find the
@@ -174 +176 @@
         hash_index_t chain;
         for (chain = 0; chain < h->entries; chain++) {
-                link_t *cur;
-                
-                for (cur = h->entry[chain].head.next; cur != &h->entry[chain].head;
+                for (cur = h->entry[chain].next; cur != &h->entry[chain];
                     cur = cur->next) {
                         if (h->op->compare(key, keys, cur)) {
@@ -203 +203 @@
 {
         hash_index_t bucket;
+        link_t *cur;
         
         for (bucket = 0; bucket < h->entries; bucket++) {
-                list_foreach(h->entry[bucket], cur) {
+                for (cur = h->entry[bucket].next; cur != &h->entry[bucket];
+                    cur = cur->next) {
                         f(cur, arg);
                 }