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

Timestamp:

2009-04-06T15:44:50Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

415d272

Parents:

37be841

Message:

call remove_callback only optionally
(this fixes the cleanup phase of the reboot command)

File:

• kernel/generic/src/adt/hash_table.c (modified) (4 diffs)

kernel/generic/src/adt/hash_table.c

@@ -132 +132 @@
 /** Remove all matching items from hash table.
  *
- * For each removed item, h->remove_callback() is called.
+ * For each removed item, h->remove_callback() is called (if not NULL).
  *
  * @param h Hash table.
@@ -147 +147 @@
         ASSERT(h->op->hash);
         ASSERT(h->op->compare);
-        ASSERT(h->op->remove_callback);
         ASSERT(keys <= h->max_keys);
         
@@ -159 +158 @@
                 if (cur) {
                         list_remove(cur);
-                        h->op->remove_callback(cur);
+                        if (h->op->remove_callback)
+                                h->op->remove_callback(cur);
                 }
                 return;
@@ -177 +177 @@
                                 
                                 list_remove(hlp);
-                                h->op->remove_callback(hlp);
+                                if (h->op->remove_callback)
+                                        h->op->remove_callback(hlp);
                                 
                                 continue;