Stupid me. I hadn't noticed the xbt_dict_get_or_null function...

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

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index eacb7fe..8668832 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -123,8 +123,8 @@ m_process_code_t MSG_get_registered_function(const char *name)
   m_process_code_t code = NULL;
 
   xbt_assert0(msg_global,"MSG_global_init has to be called before MSG_get_registered_function.");
   m_process_code_t code = NULL;
 
   xbt_assert0(msg_global,"MSG_global_init has to be called before MSG_get_registered_function.");

- 
-  code = xbt_dict_get(msg_global->registered_functions,name);
+
+  code = xbt_dict_get_or_null(msg_global->registered_functions,name);

 
   return code;
 }
 
   return code;
 }

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 1327951..37bc175 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -128,18 +128,9 @@ xbt_dict_get_ext(xbt_dict_t      dict,
 void *
 xbt_dict_get(xbt_dict_t     dict,
              const char     *key) {
 void *
 xbt_dict_get(xbt_dict_t     dict,
              const char     *key) {

-  xbt_ex_t e;

   xbt_assert(dict);
 
   xbt_assert(dict);
 

-  TRY {
-    return xbt_dictelm_get(dict->head, key);
-  } CATCH(e) {
-    if(e.category==not_found_error) {
-      return NULL;
-    }
-    RETHROW;
-  }
-  return NULL;
+  return xbt_dictelm_get(dict->head, key);

 }
 
 /**
 }
 
 /**