X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a201b7ceece70d2bc461ac48c8b746a36d07243..399a7727d537d5225f2c48613b1c67b50f31b9f2:/src/xbt/dict_multi.c

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index 4a555913f2..a11b2c96ce 100644
--- a/src/xbt/dict_multi.c
+++ b/src/xbt/dict_multi.c
@@ -1,6 +1,7 @@
 /* dict_multi - dictionnaries of dictionnaries of ... of data               */
 
-/* Copyright (c) 2003-2005 Martin Quinson. All rights reserved.             */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -12,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_multi, xbt_dict,
 
 static void _free_dict(void *d)
 {
-  VERB1("free dict %p", d);
+  XBT_VERB("free dict %p", d);
   xbt_dict_free((xbt_dict_t *) & d);
 }
 
@@ -41,16 +42,17 @@ xbt_multidict_set_ext(xbt_dict_t mdict,
   int keys_len = xbt_dynar_length(keys);
 
   xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
-  xbt_assert0(keys_len, "Can't set a zero-long key set in a multidict");
+  xbt_assert(keys_len, "Can't set a zero-long key set in a multidict");
 
-  DEBUG2("xbt_multidict_set(%p,%d)", mdict, keys_len);
+  XBT_DEBUG("xbt_multidict_set(%p,%d)", mdict, keys_len);
 
-  for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+  for (i = 0, thislevel = mdict; i < keys_len - 1;
+       i++, thislevel = nextlevel) {
 
     xbt_dynar_get_cpy(keys, i, &thiskey);
     xbt_dynar_get_cpy(lens, i, &thislen);
 
-    DEBUG5("multi_set: at level %d, len=%ld, key=%p |%*s|", i, thislen,
+    XBT_DEBUG("multi_set: at level %d, len=%ld, key=%p |%*s|", i, thislen,
            thiskey, (int) thislen, thiskey);
 
     /* search the dict of next level */
@@ -58,8 +60,9 @@ xbt_multidict_set_ext(xbt_dict_t mdict,
     if (nextlevel == NULL) {
       /* make sure the dict of next level exists */
       nextlevel = xbt_dict_new();
-      VERB1("Create a dict (%p)", nextlevel);
-      xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);
+      XBT_VERB("Create a dict (%p)", nextlevel);
+      xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel,
+                       &_free_dict);
     }
   }
 
@@ -87,13 +90,13 @@ xbt_multidict_set(xbt_dict_t mdict,
   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 %lu length", thislen, i);
+    XBT_DEBUG("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 {
+  } TRY_CLEANUP {
     xbt_dynar_free(&lens);
   } CATCH(e) {
     RETHROW;
@@ -121,17 +124,18 @@ void *xbt_multidict_get_ext(xbt_dict_t mdict,
   int keys_len = xbt_dynar_length(keys);
 
   xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
-  xbt_assert0(xbt_dynar_length(keys) >= 1,
+  xbt_assert(xbt_dynar_length(keys) >= 1,
               "Can't get a zero-long key set in a multidict");
 
-  DEBUG2("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
+  XBT_DEBUG("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
 
-  for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+  for (i = 0, thislevel = mdict; i < keys_len - 1;
+       i++, thislevel = nextlevel) {
 
     xbt_dynar_get_cpy(keys, i, &thiskey);
     xbt_dynar_get_cpy(lens, i, &thislen);
 
-    DEBUG6("multi_get: at level %d (%p), len=%ld, key=%p |%*s|",
+    XBT_DEBUG("multi_get: at level %d (%p), len=%ld, key=%p |%*s|",
            i, thislevel, thislen, thiskey, (int) thislen, thiskey);
 
     /* search the dict of next level: let mismatch raise if not found */
@@ -175,7 +179,8 @@ void *xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys)
  */
 
 void
-xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens)
+xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
+                         xbt_dynar_t lens)
 {
   xbt_dict_t thislevel, nextlevel = NULL;
   int i;
@@ -186,10 +191,11 @@ xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens)
   int keys_len = xbt_dynar_length(keys);
 
   xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
-  xbt_assert0(xbt_dynar_length(keys),
+  xbt_assert(xbt_dynar_length(keys),
               "Can't remove a zero-long key set in a multidict");
 
-  for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+  for (i = 0, thislevel = mdict; i < keys_len - 1;
+       i++, thislevel = nextlevel) {
 
     xbt_dynar_get_cpy(keys, i, &thiskey);
     xbt_dynar_get_cpy(lens, i, &thislen);
@@ -228,7 +234,7 @@ void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
 
   TRY {
     xbt_multidict_remove_ext(mdict, keys, lens);
-  } CLEANUP {
+  } TRY_CLEANUP {
     xbt_dynar_free(&lens);
   } CATCH(e) {
     RETHROW;