Changeset 7b0297b in mainline

Timestamp:

2009-04-06T15:31:31Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

44814b8

Parents:

5b7f418

Message:

split asserts into atomic conditions to ease debugging

File:

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

kernel/generic/src/adt/hash_table.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       Implementation of generic chained hash table.
+ * @brief Implementation of generic chained hash table.
  *
  * This file contains implementation of generic chained hash table.
@@ -57 +57 @@
 
         ASSERT(h);
-        ASSERT(op && op->hash && op->compare);
+        ASSERT(op);
+        ASSERT(op->hash);
+        ASSERT(op->compare);
         ASSERT(max_keys > 0);
         
         h->entry = (link_t *) malloc(m * sizeof(link_t), 0);
-        if (!h->entry) {
+        if (!h->entry)
                 panic("Cannot allocate memory for hash table.");
-        }
+        
         memsetb(h->entry, m * sizeof(link_t), 0);
         
@@ -83 +85 @@
 {
         index_t chain;
-
+        
         ASSERT(item);
-        ASSERT(h && h->op && h->op->hash && h->op->compare);
-
+        ASSERT(h);
+        ASSERT(h->op);
+        ASSERT(h->op->hash);
+        ASSERT(h->op->compare);
+        
         chain = h->op->hash(key);
         ASSERT(chain < h->entries);
@@ -104 +109 @@
         link_t *cur;
         index_t chain;
-
-        ASSERT(h && h->op && h->op->hash && h->op->compare);
-
+        
+        ASSERT(h);
+        ASSERT(h->op);
+        ASSERT(h->op->hash);
+        ASSERT(h->op->compare);
+        
         chain = h->op->hash(key);
         ASSERT(chain < h->entries);
@@ -134 +142 @@
         index_t chain;
         link_t *cur;
-
-        ASSERT(h && h->op && h->op->hash && h->op->compare && h->op->remove_callback);
+        
+        ASSERT(h);
+        ASSERT(h->op);
+        ASSERT(h->op->hash);
+        ASSERT(h->op->compare);
+        ASSERT(h->op->remove_callback);
         ASSERT(keys <= h->max_keys);
         
         if (keys == h->max_keys) {
-
+        
                 /*
                  * All keys are known, hash_table_find() can be used to find the entry.