unit test of mem.c done

[biopieces.git] / code_c / Maasha / src / lib / hash.c

diff --git a/code_c/Maasha/src/lib/hash.c b/code_c/Maasha/src/lib/hash.c
index 17e453143ba02f8eeef61cad0fd04bfdc90b9dc2..51c7129e84eb6b0f9cd3199b91801e09364c41a9 100644 (file)
--- a/code_c/Maasha/src/lib/hash.c
+++ b/code_c/Maasha/src/lib/hash.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "mem.h"
 #include "hash.h"
 #include "list.h"
 
@@ -12,7 +13,7 @@ struct hash *hash_new( size_t size )
     struct hash *new_hash;
     int         table_size;
 
-    MEM_GET( new_hash );
+    new_hash = mem_get( sizeof( new_hash ) );
 
     table_size = 1 << size;   /* table_size = ( 2 ** size ) */
 
@@ -42,7 +43,7 @@ void hash_add( struct hash *myhash, char *key, void *val )
     }
     else
     {
-        MEM_GET( new_elem );
+        new_elem = mem_get( sizeof( new_elem ) );
 
         hash_index = ( hash_key( key ) & myhash->mask );
 
@@ -141,14 +142,14 @@ void hash_destroy( struct hash *myhash )
     {
         for ( bucket = myhash->table[ i ]; bucket != NULL; bucket = bucket->next )
         {
-            mem_free( bucket->key );
+            mem_free( ( void * ) &bucket->key );
 //            mem_free( bucket->val );
-            mem_free( bucket );
+            mem_free( ( void * ) &bucket );
         }
     }
 
-    mem_free( myhash->table );
-    mem_free( myhash );
+    mem_free( ( void * ) &myhash->table );
+    mem_free( ( void * ) &myhash );
 }