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

Timestamp:

2011-10-10T06:58:55Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (diff), 80099c19 (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 with mainline

File:

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

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

@@ -76 +76 @@
         
         return true;
+}
+
+/** Remove all elements from the hash table
+ *
+ * @param h Hash table to be cleared
+ */
+void hash_table_clear(hash_table_t *h)
+{
+        for (hash_count_t chain = 0; chain < h->entries; ++chain) {
+                link_t *cur;
+                link_t *next;
+                
+                for (cur = h->entry[chain].head.next;
+                    cur != &h->entry[chain].head;
+                    cur = next) {
+                        next = cur->next;
+                        list_remove(cur);
+                        h->op->remove_callback(cur);
+                }
+        }
 }
 
@@ -198 +218 @@
  */
 void hash_table_apply(hash_table_t *h, void (*f)(link_t *, void *), void *arg)
-{
-        hash_index_t bucket;
-        
-        for (bucket = 0; bucket < h->entries; bucket++) {
-                list_foreach(h->entry[bucket], cur) {
+{       
+        for (hash_index_t bucket = 0; bucket < h->entries; bucket++) {
+                link_t *cur;
+                link_t *next;
+
+                for (cur = h->entry[bucket].head.next; cur != &h->entry[bucket].head;
+                    cur = next) {
+                        /*
+                         * The next pointer must be stored prior to the functor
+                         * call to allow using destructor as the functor (the
+                         * free function could overwrite the cur->next pointer).
+                         */
+                        next = cur->next;
                         f(cur, arg);
                 }