Try to fixup the context mess

[simgrid.git] / src / xbt / swag.c

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index 17b2c89..67319cc 100644 (file)
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -29,10 +29,7 @@ xbt_swag_t xbt_swag_new(size_t offset)
 {
   xbt_swag_t swag = xbt_new0(s_xbt_swag_t, 1);
 
-  swag->tail = NULL;
-  swag->head = NULL;
-  swag->offset = offset;
-  swag->count = 0;
+  xbt_swag_init(swag, offset);
 
   return swag;
 }
@@ -246,8 +243,8 @@ XBT_TEST_UNIT("basic",test_swag_basic,"Basic usage") {
   shmurtz_t obj1, obj2, obj;
   xbt_swag_t setA,setB;
 
-  obj1 = calloc(1,sizeof(s_shmurtz_t));
-  obj2 = calloc(1,sizeof(s_shmurtz_t));
+  obj1 = xbt_new0(s_shmurtz_t,1);
+  obj2 = xbt_new0(s_shmurtz_t,1);
 
   obj1->name="Obj 1";
   obj2->name="Obj 2";
@@ -286,6 +283,9 @@ XBT_TEST_UNIT("basic",test_swag_basic,"Basic usage") {
 
   xbt_test_assert(xbt_swag_size(setA) == 2);
   xbt_test_assert(xbt_swag_size(setB) == 1);
+   
+  xbt_swag_free(setA);
+  xbt_swag_free(setB);
 }
 
 #endif /* SIMGRID_TEST */