A distraction, the SIMIX_process_create() function takes only six parameters.

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

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index 62c999b..dc3d196 100644 (file)
--- a/src/xbt/dict_multi.c
+++ b/src/xbt/dict_multi.c
@@ -30,7 +30,7 @@ static void _free_dict(void*d) {
 void
 xbt_multidict_set_ext(xbt_dict_t  mdict,
                       xbt_dynar_t keys, xbt_dynar_t     lens,
-                      void       *data, void_f_pvoid_t *free_ctn) {
+                      void       *data, void_f_pvoid_t  free_ctn) {
       
   xbt_ex_t e;
   xbt_dict_t thislevel,nextlevel=NULL;
@@ -85,49 +85,25 @@ xbt_multidict_set_ext(xbt_dict_t  mdict,
 void
 xbt_multidict_set(xbt_dict_t  mdict,
                   xbt_dynar_t keys,
-                  void       *data,  void_f_pvoid_t *free_ctn) {
+                  void       *data,  void_f_pvoid_t free_ctn) {
   xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
-  int i;
+  unsigned long i;
   xbt_ex_t e;
 
   for (i = 0; i < xbt_dynar_length(keys); i++) {
     char *thiskey = xbt_dynar_get_as(keys, i, char*);
     unsigned long int thislen = (unsigned long int) strlen(thiskey);
-    DEBUG2("Push %ld as level %d length",thislen, i);
+    DEBUG2("Push %ld as level %lu length",thislen, i);
     xbt_dynar_push(lens,&thislen);
   }
 
-  /*TRY
-  {
-        xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
-  }
-  CLEANUP
-  {
-    xbt_dynar_free(&lens);
-  }
-  CATCH(e)
-  {
-    RETHROW;
-  }*/
-
-  TRY
-  {
-        xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
-  }
-  CLEANUP
-  {
+  TRY {
+    xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
+  } CLEANUP {
     xbt_dynar_free(&lens);
-  }
-  CATCH(e)
-  {
+  } CATCH(e) {
     RETHROW;
   }
-
-
-
-
-
-
 }
 
 /** \brief Insert \e data under all the keys contained in \e keys, providing their sizes in \e lens.
@@ -178,7 +154,7 @@ xbt_multidict_get_ext(xbt_dict_t  mdict,
 void *
 xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys) {
   xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
-  int i;
+  unsigned long i;
   void *res;
   
   for (i = 0; i < xbt_dynar_length(keys); i++) {
@@ -249,7 +225,7 @@ xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys) {
 
   xbt_ex_t e;
   xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
-  int i;
+  unsigned long i;
       
   for (i = 0; i < xbt_dynar_length(keys); i++) {
     char *thiskey = xbt_dynar_get_as(keys, i, char*);