Declare all variables at the begining for ANSI C standard compatibility.

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

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index c317b81..62c999b 100644 (file)
--- a/src/xbt/dict_multi.c
+++ b/src/xbt/dict_multi.c
@@ -9,7 +9,7 @@
 
 #include "dict_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(dict_multi,dict, "Dictionaries of multiple keys");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_multi,xbt_dict, "Dictionaries of multiple keys");
 
 static void _free_dict(void*d) {
   VERB1("free dict %p",d);
@@ -97,13 +97,37 @@ xbt_multidict_set(xbt_dict_t  mdict,
     xbt_dynar_push(lens,&thislen);
   }
 
-  TRY {
-    xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
-  } CLEANUP {
-    xbt_dynar_free(&lens);         
-  } CATCH(e) {
+  /*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
+  {
+    xbt_dynar_free(&lens);
   }
+  CATCH(e)
+  {
+    RETHROW;
+  }
+
+
+
+
+
+
 }
 
 /** \brief Insert \e data under all the keys contained in \e keys, providing their sizes in \e lens.