Last bits of convertion from xbt_error_t to exceptions. Some more cleanups (mainly...

[simgrid.git] / include / xbt / dict.h

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index 00b5c80..395f53e 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -12,7 +12,6 @@
 #define _XBT_DICT_H
 
 #include "xbt/misc.h" /* BEGIN_DECL */
-#include "xbt/error.h"
 #include "xbt/dynar.h" /* void_f_pvoid_t */
 
 BEGIN_DECL()
@@ -61,9 +60,11 @@ BEGIN_DECL()
  *
  *  @{ */
 
-  void xbt_dict_set(xbt_dict_t head, const char *key, void *data, void_f_pvoid_t *free_ctn);
-  xbt_error_t xbt_dict_get(xbt_dict_t head,const char *key, /* OUT */void **data);
-  xbt_error_t xbt_dict_remove(xbt_dict_t head,const char *key);
+  void  xbt_dict_set(xbt_dict_t head, const char *key, void *data, void_f_pvoid_t *free_ctn);
+  void *xbt_dict_get(xbt_dict_t head,const char *key);
+  void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key);
+
+  void xbt_dict_remove(xbt_dict_t head, const char *key);
   void xbt_dict_dump(xbt_dict_t head,void (*output)(void*));
   
 /** @} */
@@ -73,14 +74,12 @@ BEGIN_DECL()
  *
  *  @{
  */
-  void xbt_dict_set_ext(xbt_dict_t     head,
-                       const char     *key, int  key_len,
-                       void           *data,
-                       void_f_pvoid_t *free_ctn);
-  xbt_error_t xbt_dict_get_ext(xbt_dict_t head,const char *key, int key_len,
-                              /* OUT */void **data);
-  xbt_error_t xbt_dict_remove_ext(xbt_dict_t head,
-                                 const char *key, int key_len);
+  void  xbt_dict_set_ext(xbt_dict_t     head,
+                        const char     *key, int  key_len,
+                        void           *data,
+                        void_f_pvoid_t *free_ctn);
+  void *xbt_dict_get_ext(xbt_dict_t head,const char *key, int key_len);
+  void xbt_dict_remove_ext(xbt_dict_t head, const char *key, int key_len);
 
 
 /** @} */
@@ -104,7 +103,7 @@ BEGIN_DECL()
  *
  *  @{ */
 
-  /** \brief Cursor on dictionnaries (opaque type) */
+  /** @brief Cursor on dictionnaries (opaque type) */
   typedef struct xbt_dict_cursor_ *xbt_dict_cursor_t;
   xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t head);
   void               xbt_dict_cursor_free(xbt_dict_cursor_t *cursor);
@@ -112,10 +111,8 @@ BEGIN_DECL()
   void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor);
 
 
-  xbt_error_t xbt_dict_cursor_get_key     (xbt_dict_cursor_t cursor,
-                                          /*OUT*/char **key);
-  xbt_error_t xbt_dict_cursor_get_data    (xbt_dict_cursor_t cursor,
-                                          /*OUT*/void **data);
+  char * xbt_dict_cursor_get_key     (xbt_dict_cursor_t cursor);
+  void * xbt_dict_cursor_get_data    (xbt_dict_cursor_t cursor);
 
   void xbt_dict_cursor_first (const xbt_dict_t   dict,
                             xbt_dict_cursor_t *cursor);
@@ -123,8 +120,8 @@ BEGIN_DECL()
   int          xbt_dict_cursor_get_or_free (xbt_dict_cursor_t *cursor,
                                            char              **key,
                                            void              **data);
-  /** \brief toto 
-      \hideinitializer */
+  /** @def xbt_dict_foreach
+      @hideinitializer */
 #  define xbt_dict_foreach(dict,cursor,key,data)                       \
     for (cursor=NULL, xbt_dict_cursor_first((dict),&(cursor)) ;        \
          xbt_dict_cursor_get_or_free(&(cursor),&(key),(void**)(&data));\
@@ -150,32 +147,23 @@ void xbt_dict_prints(void *data);
 
 
 /*----[ xbt_multidict_set ]--------------------------------------------------*/
-xbt_error_t 
+void
 xbt_multidict_set(xbt_dict_t mdict,
                   xbt_dynar_t keys,
                   void *data,void (*free_ctn)(void*));
-xbt_error_t
+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_multidict_get ]--------------------------------------------------*/
-xbt_error_t 
-xbt_multidict_get(xbt_dict_t mdict,
-                  xbt_dynar_t keys,
-                 /*OUT*/void **data);
-xbt_error_t 
-xbt_multidict_get_ext(xbt_dict_t mdict,
-                      xbt_dynar_t keys, xbt_dynar_t lens,
-                      /*OUT*/void **data);
+void *xbt_multidict_get    (xbt_dict_t mdict, xbt_dynar_t keys);
+void *xbt_multidict_get_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens);
 
 /*----[ xbt_multidict_remove ]-----------------------------------------------*/
 /*---------------------------------------------------------------------------*/
-xbt_error_t 
-xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys);
-xbt_error_t 
-xbt_multidict_remove_ext(xbt_dict_t mdict, 
-                         xbt_dynar_t keys, xbt_dynar_t lens);
+void xbt_multidict_remove(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);
 
 /** @} */
 /** @} */