X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a30eb8d63c2291f6b50b935cecf16139b372f9f2..b968babddbbe251290acf05634d66474faeb9885:/src/xbt/dict_multi.c?ds=sidebyside

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index eadf725aab..773ec8fe2c 100644
--- 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);
@@ -30,12 +30,11 @@ 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) {
-      
-  xbt_ex_t e;
+                      void       *data, void_f_pvoid_t  free_ctn) {
+
   xbt_dict_t thislevel,nextlevel=NULL;
   int i;
-  
+
   unsigned long int thislen;
   char *thiskey;
   int keys_len=xbt_dynar_length(keys);
@@ -45,24 +44,19 @@ xbt_multidict_set_ext(xbt_dict_t  mdict,
 
   DEBUG2("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, thiskey, (int)thislen,thiskey);
 
     /* search the dict of next level */
-    TRY {
-      nextlevel = xbt_dict_get_ext(thislevel, thiskey, thislen);
-    } CATCH(e) {
-      if (e.category != not_found_error)
-	RETHROW;
-
+    nextlevel = xbt_dict_get_or_null_ext(thislevel, thiskey, thislen);
+    if (nextlevel == NULL) {
       /* make sure the dict of next level exists */
-      xbt_ex_free(&e);
       nextlevel=xbt_dict_new();
       VERB1("Create a dict (%p)",nextlevel);
       xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);
@@ -71,7 +65,7 @@ xbt_multidict_set_ext(xbt_dict_t  mdict,
 
   xbt_dynar_get_cpy(keys, i, &thiskey);
   xbt_dynar_get_cpy(lens, i, &thislen);
-  
+
   xbt_dict_set_ext(thislevel, thiskey, thislen, data, free_ctn);
 }
 
@@ -85,22 +79,22 @@ 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);         
+    xbt_dynar_free(&lens);
   } CATCH(e) {
     RETHROW;
   }
@@ -128,35 +122,35 @@ xbt_multidict_get_ext(xbt_dict_t  mdict,
 
   xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
   xbt_assert0(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));
 
-  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|", 
-      i, thislevel, thislen, thiskey, (int)thislen,thiskey);
+    DEBUG6("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 */
     nextlevel = xbt_dict_get_ext(thislevel, thiskey, thislen);
   }
-  
+
   xbt_dynar_get_cpy(keys, i, &thiskey);
   xbt_dynar_get_cpy(lens, i, &thislen);
-  
+
   return xbt_dict_get_ext(thislevel, thiskey, thislen);
 }
 
 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++) {
     char *thiskey = xbt_dynar_get_as(keys, i, char*);
     unsigned long int thislen = (unsigned long int) strlen(thiskey);
@@ -164,7 +158,7 @@ xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys) {
   }
 
   res = xbt_multidict_get_ext(mdict, keys, lens),
-  xbt_dynar_free(&lens);         
+  xbt_dynar_free(&lens);
   return res;
 }
 
@@ -195,10 +189,10 @@ xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens) {
   xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
   xbt_assert0(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);
 
@@ -207,16 +201,16 @@ xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens) {
       nextlevel = xbt_dict_get_ext(thislevel, thiskey, thislen);
     } CATCH(e) {
       /* If non-existant entry, nothing to do */
-      if (e.category == arg_error) 
-	xbt_ex_free(&e);
-      else 
-	RETHROW;
+      if (e.category == arg_error)
+        xbt_ex_free(e);
+      else
+        RETHROW;
     }
   }
 
   xbt_dynar_get_cpy(keys, i, &thiskey);
   xbt_dynar_get_cpy(lens, i, &thislen);
-  
+
   xbt_dict_remove_ext(thislevel, thiskey, thislen);
 }
 
@@ -225,14 +219,14 @@ 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*);
     unsigned long int thislen = strlen(thiskey);
     xbt_dynar_push(lens,&thislen);
   }
-         
+
   TRY {
     xbt_multidict_remove_ext(mdict, keys, lens);
   } CLEANUP {