X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/baa212aa2fc1e0f91b0e9a9536db52f1657331a8..a63c83a55c527e6e95c92cf2ef65ae575902387e:/src/xbt/dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 14d5a211f1..7ad68349fa 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -13,7 +13,7 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
+#include "xbt/ex.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
@@ -22,6 +22,7 @@ typedef struct xbt_dictelm_ {
   char           *key;
   int             key_len;
   int             offset; /* offset on the key */
+  int             internal; /* true if it's only an internal node */
   void           *content;
   void_f_pvoid_t *free_f; /*pointer to the function to call to free this ctn*/
 
@@ -35,31 +36,29 @@ typedef struct xbt_dict_ {
 typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
 
 /*####[ Function prototypes ]################################################*/
-void xbt_dictelm_free      (s_xbt_dictelm_t **pp_elm);
+void  xbt_dictelm_free      (s_xbt_dictelm_t **pp_elm);
 
-void xbt_dictelm_set       (s_xbt_dictelm_t **pp_head,
+void  xbt_dictelm_set       (s_xbt_dictelm_t **pp_head,
 			     const char      *_key,
 			     void            *data,
 			     void_f_pvoid_t  *free_ctn);
-void xbt_dictelm_set_ext   (s_xbt_dictelm_t **pp_head,
+void  xbt_dictelm_set_ext   (s_xbt_dictelm_t **pp_head,
 			     const char      *_key,
 			     int              key_len,
 			     void            *data,
 			     void_f_pvoid_t  *free_ctn);
 
-xbt_error_t xbt_dictelm_get       (s_xbt_dictelm_t *p_head,
-				     const char     *key,
-				     /* OUT */void **data);
-xbt_error_t xbt_dictelm_get_ext   (s_xbt_dictelm_t *p_head,
-				     const char     *key,
-				     int             key_len,
-				     /* OUT */void **data);
-
-xbt_error_t xbt_dictelm_remove    (s_xbt_dictelm_t *p_head,
-				     const char  *key);
-xbt_error_t xbt_dictelm_remove_ext(s_xbt_dictelm_t *p_head,
-				       const char  *key,
-				       int          key_len);
+void* xbt_dictelm_get       (s_xbt_dictelm_t *p_head, 
+	                     const char     *key);
+void* xbt_dictelm_get_ext   (s_xbt_dictelm_t *p_head,
+			     const char     *key,
+			     int             key_len);
+
+void xbt_dictelm_remove    (s_xbt_dictelm_t *p_head,
+			    const char  *key);
+void xbt_dictelm_remove_ext(s_xbt_dictelm_t *p_head,
+			    const char  *key,
+			    int          key_len);
 
 void         xbt_dictelm_dump      (s_xbt_dictelm_t *p_head,
 				     void_f_pvoid_t *output);