star eradication, mainly (check changelog)

[simgrid.git] / testsuite / xbt / config_usage.c

diff --git a/testsuite/xbt/config_usage.c b/testsuite/xbt/config_usage.c
index f4ff054..b85638c 100644 (file)
--- a/testsuite/xbt/config_usage.c
+++ b/testsuite/xbt/config_usage.c
@@ -6,14 +6,14 @@
 #include <gras.h>
 
 /*====[ Prototypes ]=========================================================*/
-gras_cfg_t *make_set(void); /* build a minimal set */
+gras_cfg_t make_set(void); /* build a minimal set */
 
 /*====[ Code ]===============================================================*/
-gras_cfg_t *make_set(){
-  gras_cfg_t *set=NULL; 
+gras_cfg_t make_set(){
+  gras_cfg_t set=NULL; 
   gras_error_t errcode;
 
-  gras_cfg_new(&set);
+  set = gras_cfg_new();
   TRYFAIL(gras_cfg_register_str(set,"speed:1_to_2_int"));
   TRYFAIL(gras_cfg_register_str(set,"hostname:1_to_1_string"));
   TRYFAIL(gras_cfg_register_str(set,"user:1_to_10_string"));
@@ -25,9 +25,9 @@ gras_cfg_t *make_set(){
  
 int main(int argc, char **argv) {
   gras_error_t errcode;
-  gras_cfg_t *set;
+  gras_cfg_t set;
 
-  gras_dynar_t *dyn;
+  gras_dynar_t dyn;
   char *str;
   int ival;
   
@@ -37,12 +37,14 @@ int main(int argc, char **argv) {
   set=make_set();
   gras_cfg_dump("test set","",set);
   gras_cfg_free(&set);
+  gras_cfg_free(&set);
 
 
   fprintf(stderr,"==== Try to use an unregistered option. (ERROR EXPECTED: 'color' not registered)\n");
   set=make_set();
   TRYEXPECT(mismatch_error,gras_cfg_set_parse(set,"color:blue"));
   gras_cfg_free(&set);
+  gras_cfg_free(&set);
 
 
   fprintf(stderr,
@@ -58,6 +60,7 @@ int main(int argc, char **argv) {
   gras_cfg_set_parse(set,"speed:42 speed:24 speed:34");
   gras_cfg_check(set);
   gras_cfg_free(&set);
+  gras_cfg_free(&set);
 
   fprintf(stderr,"==== Get single value (Expected: 'speed value: 42')\n");
   set=make_set();
@@ -65,6 +68,7 @@ int main(int argc, char **argv) {
   gras_cfg_get_int(set,"speed",&ival);
   fprintf(stderr,"speed value: %d\n",ival); 
   gras_cfg_free(&set);
+  gras_cfg_free(&set);
 
   fprintf(stderr,"==== Get multiple values (Expected: 'Count: 3; Options: mquinson;ecaron;alegrand;')\n");
   set=make_set();
@@ -77,6 +81,7 @@ int main(int argc, char **argv) {
   }
   fprintf(stderr,"\n");
   gras_cfg_free(&set);
+  gras_cfg_free(&set);
 
   gras_exit();
   return 0;