Catch up with the lastest API breakage

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2109 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index 952931e..d4ac84b 100644 (file)
--- a/src/gras/DataDesc/cbps.c
+++ b/src/gras/DataDesc/cbps.c
@@ -99,7 +99,7 @@ gras_cbps_v_push(gras_cbps_t          ps,
     DEBUG1("Create a new variable stack for '%s' into the space",name);
     varstack = xbt_dynar_new(sizeof (gras_cbps_elm_t *), NULL);
     xbt_dict_set(ps->space, varname, (void **)varstack, NULL);
     DEBUG1("Create a new variable stack for '%s' into the space",name);
     varstack = xbt_dynar_new(sizeof (gras_cbps_elm_t *), NULL);
     xbt_dict_set(ps->space, varname, (void **)varstack, NULL);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

     /* leaking, you think? only if you do not close all the openned blocks ;)*/
   }
  
     /* leaking, you think? only if you do not close all the openned blocks ;)*/
   }
  


@@ -137,7 +137,7 @@ gras_cbps_v_pop (gras_cbps_t            ps,
     if (e.category != mismatch_error)
       RETHROW;
 
     if (e.category != mismatch_error)
       RETHROW;
 

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

     THROW1(not_found_error,1,"Asked to pop the non-existant %s", name);
   }
   xbt_dynar_pop(varstack, &var);
     THROW1(not_found_error,1,"Asked to pop the non-existant %s", name);
   }
   xbt_dynar_pop(varstack, &var);

diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c
index 1ac7274..0bbc088 100644 (file)
--- a/src/gras/DataDesc/ddt_create.c
+++ b/src/gras/DataDesc/ddt_create.c
@@ -59,7 +59,7 @@ gras_datadesc_type_t gras_datadesc_by_name(const char *name) {
   } CATCH(e) {
     if (e.category != not_found_error)
       RETHROW;
   } CATCH(e) {
     if (e.category != not_found_error)
       RETHROW;

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

     res = NULL;
   }
   return res;
     res = NULL;
   }
   return res;


@@ -76,7 +76,7 @@ gras_datadesc_type_t gras_datadesc_by_id(long int code) {
   } CATCH(e) {
     if (e.category != not_found_error)
       RETHROW;
   } CATCH(e) {
     if (e.category != not_found_error)
       RETHROW;

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

     res = NULL;
   }
   return res;
     res = NULL;
   }
   return res;

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index 49f0879..d369df6 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -231,7 +231,7 @@ gras_datadesc_copy_rec(gras_cbps_t           state,
       if (e.category != not_found_error)
        RETHROW;
       reference_is_to_cpy = 1;
       if (e.category != not_found_error)
        RETHROW;
       reference_is_to_cpy = 1;

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

     }
 
     if (reference_is_to_cpy) {
     }
 
     if (reference_is_to_cpy) {


@@ -511,7 +511,7 @@ gras_datadesc_send_rec(gras_socket_t         sock,
       if (e.category != not_found_error)
        RETHROW;
       reference_is_to_send = 1;
       if (e.category != not_found_error)
        RETHROW;
       reference_is_to_send = 1;

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

     }
 
     if (reference_is_to_send) {
     }
 
     if (reference_is_to_send) {


@@ -766,7 +766,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
       if (e.category != not_found_error)
         RETHROW;
       reference_is_to_recv = 1;
       if (e.category != not_found_error)
         RETHROW;
       reference_is_to_recv = 1;

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

     }
     if (reference_is_to_recv) {
       int subsubcount = 0;
     }
     if (reference_is_to_recv) {
       int subsubcount = 0;

diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c
index 341767e..193c6f1 100644 (file)
--- a/src/gras/DataDesc/ddt_parse.c
+++ b/src/gras/DataDesc/ddt_parse.c
@@ -498,7 +498,7 @@ static gras_datadesc_type_t parse_struct(char *definition) {
     } CATCH(e) {
       if (e.category != mismatch_error)
        RETHROW;
     } CATCH(e) {
       if (e.category != mismatch_error)
        RETHROW;

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       done = 1;
     }
     
       done = 1;
     }
     

diff --git a/src/xbt/config.c b/src/xbt/config.c
index f89e94c..e10dc0d 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -215,7 +215,7 @@ xbt_cfg_register(xbt_cfg_t cfg,
   } CATCH(e) {
     if (e.category == not_found_error) {
       found = 1;
   } CATCH(e) {
     if (e.category == not_found_error) {
       found = 1;

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

     } else {
       RETHROW;
     }
     } else {
       RETHROW;
     }


@@ -372,7 +372,7 @@ static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t  cfg,
     res = xbt_dict_get((xbt_dict_t)cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) {
     res = xbt_dict_get((xbt_dict_t)cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) {

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       THROW1(not_found_error,0,
             "No registered variable '%s' in this config set",name);
     }
       THROW1(not_found_error,0,
             "No registered variable '%s' in this config set",name);
     }


@@ -406,7 +406,7 @@ xbt_cfg_get_type(xbt_cfg_t cfg, const char *name) {
     variable = xbt_dict_get((xbt_dict_t)cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) { 
     variable = xbt_dict_get((xbt_dict_t)cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) { 

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       THROW1(not_found_error,0,
             "Can't get the type of '%s' since this variable does not exist",name);
     }
       THROW1(not_found_error,0,
             "Can't get the type of '%s' since this variable does not exist",name);
     }


@@ -440,7 +440,7 @@ xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa) {
     type = xbt_cfg_get_type(cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) {
     type = xbt_cfg_get_type(cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) {

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       THROW1(not_found_error,0,"Can't set the property '%s' since it's not registered",name);
     }
     RETHROW;
       THROW1(not_found_error,0,"Can't set the property '%s' since it's not registered",name);
     }
     RETHROW;


@@ -579,7 +579,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
       name = (char*) (optionlist_cpy-name + options); 
       free(optionlist_cpy);
       if (e.category == not_found_error) {
       name = (char*) (optionlist_cpy-name + options); 
       free(optionlist_cpy);
       if (e.category == not_found_error) {

-       xbt_ex_free(e);
+       xbt_ex_free(&e);

        THROW1(not_found_error,0,"No registrated variable corresponding to '%s'.",name);
       }
       RETHROW;
        THROW1(not_found_error,0,"No registrated variable corresponding to '%s'.",name);
       }
       RETHROW;


@@ -951,7 +951,7 @@ xbt_cfg_empty(xbt_cfg_t cfg,const char*name) {
     if (e.category != not_found_error)
       RETHROW;
 
     if (e.category != not_found_error)
       RETHROW;
 

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

     THROW1(not_found_error,0,
           "Can't empty  '%s' since this config element does not exist", name);
   }
     THROW1(not_found_error,0,
           "Can't empty  '%s' since this config element does not exist", name);
   }


@@ -1092,7 +1092,7 @@ xbt_dynar_t xbt_cfg_get_dynar (xbt_cfg_t    cfg, const char *name) {
     variable = xbt_dict_get((xbt_dict_t)cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) {
     variable = xbt_dict_get((xbt_dict_t)cfg,name);
   } CATCH(e) {
     if (e.category == not_found_error) {

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       THROW1(not_found_error,0,
             "No registered variable %s in this config set",name);
     }
       THROW1(not_found_error,0,
             "No registered variable %s in this config set",name);
     }


@@ -1178,7 +1178,7 @@ XBT_TEST_UNIT("validation",test_config_validation,"Validation tests") {
     if (e.category != mismatch_error || 
        strncmp(e.msg,"Config elem speed needs",strlen("Config elem speed needs")))
       xbt_test_fail1("Got an exception. msg=%s",e.msg);
     if (e.category != mismatch_error || 
        strncmp(e.msg,"Config elem speed needs",strlen("Config elem speed needs")))
       xbt_test_fail1("Got an exception. msg=%s",e.msg);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

   }
   xbt_cfg_free(&set);
   xbt_cfg_free(&set);
   }
   xbt_cfg_free(&set);
   xbt_cfg_free(&set);


@@ -1195,7 +1195,7 @@ XBT_TEST_UNIT("validation",test_config_validation,"Validation tests") {
        strncmp(e.msg,"Cannot add value 34 to the config elem speed",
                strlen("Config elem speed needs")))
       xbt_test_fail1("Got an exception. msg=%s",e.msg);
        strncmp(e.msg,"Cannot add value 34 to the config elem speed",
                strlen("Config elem speed needs")))
       xbt_test_fail1("Got an exception. msg=%s",e.msg);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

   }
   xbt_cfg_check(set);
   xbt_cfg_free(&set);
   }
   xbt_cfg_check(set);
   xbt_cfg_free(&set);


@@ -1256,7 +1256,7 @@ XBT_TEST_UNIT("use",test_config_use,"Data retrieving tests") {
     } CATCH(e) {
       if (e.category != not_found_error)
         xbt_test_exception(e);
     } CATCH(e) {
       if (e.category != not_found_error)
         xbt_test_exception(e);

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

     }
     xbt_cfg_free(&myset);    
   }
     }
     xbt_cfg_free(&myset);    
   }

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index a673500..1dd1e31 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -146,7 +146,7 @@ xbt_dict_get_or_null(xbt_dict_t     dict,
   } CATCH(e) {
     if (e.category != not_found_error) 
       RETHROW;
   } CATCH(e) {
     if (e.category != not_found_error) 
       RETHROW;

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

     res=NULL;
   }
   return res;
     res=NULL;
   }
   return res;


@@ -292,7 +292,7 @@ static void search_not_found(xbt_dict_t head, const char *data) {
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

   }
 }
 
   }
 }
 


@@ -371,7 +371,7 @@ XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

   }
   traverse(head);
 
   }
   traverse(head);
 


@@ -383,7 +383,7 @@ XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){
   } CATCH(e) {
     if (e.category != arg_error) 
       xbt_test_exception(e);
   } CATCH(e) {
     if (e.category != arg_error) 
       xbt_test_exception(e);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

   } 
 
   xbt_test_add0("Remove each data manually (traversing the resulting dictionnary each time)");
   } 
 
   xbt_test_add0("Remove each data manually (traversing the resulting dictionnary each time)");


@@ -397,7 +397,7 @@ XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);

-    xbt_ex_free(e);         
+    xbt_ex_free(&e);         

     traverse(head);
   } 
   debuged_remove(head,"1234");   traverse(head);
     traverse(head);
   } 
   debuged_remove(head,"1234");   traverse(head);


@@ -408,7 +408,7 @@ XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

   }                              traverse(head);
   
   xbt_test_add0("Free the dictionnary twice");
   }                              traverse(head);
   
   xbt_test_add0("Free the dictionnary twice");

diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index 1827eeb..fbe037f 100644 (file)
--- a/src/xbt/dict_cursor.c
+++ b/src/xbt/dict_cursor.c
@@ -188,7 +188,7 @@ xbt_dict_cursor_get_or_free(xbt_dict_cursor_t  *cursor,
   } CATCH(e) {
     if (e.category == mismatch_error) {
       xbt_dict_cursor_free(cursor);
   } CATCH(e) {
     if (e.category == mismatch_error) {
       xbt_dict_cursor_free(cursor);

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       return FALSE;
     }
     RETHROW;
       return FALSE;
     }
     RETHROW;

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index c317b81..eadf725 100644 (file)
--- a/src/xbt/dict_multi.c
+++ b/src/xbt/dict_multi.c
@@ -62,7 +62,7 @@ xbt_multidict_set_ext(xbt_dict_t  mdict,
        RETHROW;
 
       /* make sure the dict of next level exists */
        RETHROW;
 
       /* make sure the dict of next level exists */

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       nextlevel=xbt_dict_new();
       VERB1("Create a dict (%p)",nextlevel);
       xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);
       nextlevel=xbt_dict_new();
       VERB1("Create a dict (%p)",nextlevel);
       xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);


@@ -208,7 +208,7 @@ xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens) {
     } CATCH(e) {
       /* If non-existant entry, nothing to do */
       if (e.category == arg_error) 
     } CATCH(e) {
       /* If non-existant entry, nothing to do */
       if (e.category == arg_error) 

-       xbt_ex_free(e);
+       xbt_ex_free(&e);

       else 
        RETHROW;
     }
       else 
        RETHROW;
     }

diff --git a/src/xbt/log.c b/src/xbt/log.c
index e80332a..e84d50f 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -687,7 +687,7 @@ void xbt_log_control_set(const char* control_string) {
     } CATCH(e) {
       if (e.category != not_found_error)
        RETHROW;
     } CATCH(e) {
       if (e.category != not_found_error)
        RETHROW;

-      xbt_ex_free(e);
+      xbt_ex_free(&e);

       found = 0;
 
       DEBUG0("Store for further application");
       found = 0;
 
       DEBUG0("Store for further application");

diff --git a/src/xbt/set.c b/src/xbt/set.c
index 5ac0f0c..8991459 100644 (file)
--- a/src/xbt/set.c
+++ b/src/xbt/set.c
@@ -79,7 +79,7 @@ void xbt_set_add    (xbt_set_t      set,
     xbt_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func);
     xbt_dynar_set(set->dynar, elm->ID, &elm);
     DEBUG2("Insertion of key '%s' (id %d)", elm->name, elm->ID);
     xbt_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func);
     xbt_dynar_set(set->dynar, elm->ID, &elm);
     DEBUG2("Insertion of key '%s' (id %d)", elm->name, elm->ID);

-    xbt_ex_free(e);
+    xbt_ex_free(&e);

   }
   
   if (found) {
   }
   
   if (found) {


@@ -315,7 +315,7 @@ static void search_not_found(xbt_set_t set, const char *data) {
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);
   } CATCH(e) {
     if (e.category != not_found_error) 
       xbt_test_exception(e);

-    xbt_ex_free(e);  
+    xbt_ex_free(&e);  

   }
 }
 
   }
 }