Index: kernel/generic/src/adt/hash_table.c
===================================================================
--- kernel/generic/src/adt/hash_table.c	(revision 5b7f418122c84346a6f6d6e912afad481a500266)
+++ kernel/generic/src/adt/hash_table.c	(revision 7b0297b035184452f47c9eb3d0eed27cf2ae6d1b)
@@ -33,5 +33,5 @@
 /**
  * @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,11 +57,13 @@
 
 	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,8 +85,11 @@
 {
 	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,7 +109,10 @@
 	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,10 +142,14 @@
 	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.