From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sun, 7 Aug 2005 10:53:33 +0000 (+0000)
Subject: Use xbt_dict_get_or_null since it's what we mean.
X-Git-Tag: v3.3~3764
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e1657c3c4c5c71b3791a2566f783c20fea534da2

Use xbt_dict_get_or_null since it's what we mean.


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

diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c
index 127cfbe064..588427834d 100644
--- a/src/gras/Virtu/sg_emul.c
+++ b/src/gras/Virtu/sg_emul.c
@@ -45,18 +45,8 @@ void gras_emul_exit(void) {
 static void store_in_dict(xbt_dict_t dict, const char *key, double value)
 {
   double *ir;
-  xbt_ex_t e;
-
-  TRY {
-    ir = xbt_dict_get(dict, key);
-  } CATCH(e) {
-    if (e.category == mismatch_error) {
-      ir = NULL;
-      xbt_ex_free(e);
-    } else {
-      RETHROW;
-    }
-  }
+
+  ir = xbt_dict_get_or_null(dict, key);
   if (!ir) {
     ir = xbt_new0(double,1);
     xbt_dict_set(dict, key, ir, free);
@@ -96,7 +86,6 @@ int gras_bench_always_end(void)
 
 int gras_bench_once_begin(const char *location,int line) { 
   double *ir = NULL;
-  xbt_ex_t e;
   xbt_assert0(!benchmarking,"Already benchmarking");
   benchmarking = 1;
 
@@ -106,16 +95,7 @@ int gras_bench_once_begin(const char *location,int line) {
   }
   sprintf(locbuf,"%s:%d",location, line);
    
-  TRY {
-    ir = xbt_dict_get(benchmark_set, locbuf);
-  } CATCH(e) {
-    if (e.category == mismatch_error) {
-      xbt_ex_free(e);
-      ir = NULL;
-    } else {
-      RETHROW;
-    }
-  }
+  ir = xbt_dict_get_or_null(benchmark_set, locbuf);
   if(!ir) {
     DEBUG1("%s",locbuf); 
     duration = 1;