X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/013162cd57963a4b78fa05b5d8b01592f1d759b6..6760cb07d6b57be16928d95339d71e57c4e24f36:/src/swag_unit.c

diff --git a/src/swag_unit.c b/src/swag_unit.c
index e6d0d437ec..c6b6ce3109 100644
--- a/src/swag_unit.c
+++ b/src/swag_unit.c
@@ -2,12 +2,13 @@
 /* GENERATED FILE, DO NOT EDIT */
 /*******************************/
 
+#include <stdio.h>
 #include "xbt.h"
 /*******************************/
 /* GENERATED FILE, DO NOT EDIT */
 /*******************************/
 
-# 236 "xbt/swag.c" 
+# 220 "/home/navarrop/Developments/simgrid/src/xbt/swag.c" 
 
 
 typedef struct {
@@ -17,22 +18,23 @@ typedef struct {
 } shmurtz, s_shmurtz_t, *shmurtz_t;
 
 
-XBT_TEST_UNIT("basic",test_swag_basic,"Basic usage") {
+XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
+{
   shmurtz_t obj1, obj2, obj;
-  xbt_swag_t setA,setB;
+  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";
+  obj1->name = "Obj 1";
+  obj2->name = "Obj 2";
 
   xbt_test_add0("Basic usage");
-  xbt_test_log3("%p %p %ld\n",obj1,&(obj1->setB),
-		(long)((char *)&(obj1->setB) - (char *)obj1));
+  xbt_test_log3("%p %p %ld\n", obj1, &(obj1->setB),
+                (long) ((char *) &(obj1->setB) - (char *) obj1));
 
-  setA = xbt_swag_new(xbt_swag_offset(*obj1,setA));
-  setB = xbt_swag_new(xbt_swag_offset(*obj1,setB));
+  setA = xbt_swag_new(xbt_swag_offset(*obj1, setA));
+  setB = xbt_swag_new(xbt_swag_offset(*obj1, setB));
 
   xbt_swag_insert(obj1, setA);
   xbt_swag_insert(obj1, setB);
@@ -40,28 +42,28 @@ XBT_TEST_UNIT("basic",test_swag_basic,"Basic usage") {
   xbt_swag_insert(obj2, setB);
 
   xbt_swag_remove(obj1, setB);
-  /*  xbt_swag_remove(obj2, setB);*/
+  /*  xbt_swag_remove(obj2, setB); */
 
   xbt_test_add0("Traverse set A");
-  xbt_swag_foreach(obj,setA) {
-    xbt_test_log1("Saw: %s",obj->name);
+  xbt_swag_foreach(obj, setA) {
+    xbt_test_log1("Saw: %s", obj->name);
   }
 
   xbt_test_add0("Traverse set B");
-  xbt_swag_foreach(obj,setB) {
-    xbt_test_log1("Saw: %s",obj->name);
+  xbt_swag_foreach(obj, setB) {
+    xbt_test_log1("Saw: %s", obj->name);
   }
 
   xbt_test_add0("Ensure set content and length");
-  xbt_test_assert(  xbt_swag_belongs(obj1,setA));
-  xbt_test_assert(  xbt_swag_belongs(obj2,setA));
+  xbt_test_assert(xbt_swag_belongs(obj1, setA));
+  xbt_test_assert(xbt_swag_belongs(obj2, setA));
 
-  xbt_test_assert(! xbt_swag_belongs(obj1,setB));
-  xbt_test_assert(  xbt_swag_belongs(obj2,setB));
+  xbt_test_assert(!xbt_swag_belongs(obj1, setB));
+  xbt_test_assert(xbt_swag_belongs(obj2, setB));
 
   xbt_test_assert(xbt_swag_size(setA) == 2);
   xbt_test_assert(xbt_swag_size(setB) == 1);
-   
+
   xbt_swag_free(setA);
   xbt_swag_free(setB);
 }