Changeset cac458f in mainline for uspace/lib/c/generic/adt/hash_table.c

Timestamp:

2011-06-22T01:59:39Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

41e2118

Parents:

79506d6 (diff), f1fae414 (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 libposix changes.

File:

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

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

@@ -61 +61 @@
         assert(max_keys > 0);
         
-        h->entry = malloc(m * sizeof(link_t));
+        h->entry = malloc(m * sizeof(list_t));
         if (!h->entry)
                 return false;
         
-        memset((void *) h->entry, 0,  m * sizeof(link_t));
+        memset((void *) h->entry, 0,  m * sizeof(list_t));
         
         hash_count_t i;
@@ -123 +123 @@
         assert(chain < h->entries);
         
-        link_t *cur;
-        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)) {
                         /*
@@ -153 +151 @@
         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
@@ -176 +174 @@
         hash_index_t chain;
         for (chain = 0; chain < h->entries; chain++) {
-                for (cur = h->entry[chain].next; cur != &h->entry[chain];
+                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)) {
@@ -203 +203 @@
 {
         hash_index_t bucket;
-        link_t *cur;
         
         for (bucket = 0; bucket < h->entries; bucket++) {
-                for (cur = h->entry[bucket].next; cur != &h->entry[bucket];
-                    cur = cur->next) {
+                list_foreach(h->entry[bucket], cur) {
                         f(cur, arg);
                 }