X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1068773bda2a9c50385808a643a04e4a1fc2c7a..bfbe7002a7ff4147e838e6d88841ed8e87683683:/include/xbt/dict.h

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index ad95cc9004..cb020d497b 100644
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -17,49 +17,48 @@ extern "C"
 #endif
 
 /*####[ Type definition ]####################################################*/
-typedef struct gras_dict_ gras_dict_t;
+typedef struct gras_dict_ *gras_dict_t;
 
 /*####[ Simple dict  functions ]#############################################*/
 
-gras_error_t gras_dict_new(gras_dict_t **dict);
-void         gras_dict_free(gras_dict_t **dict);
+gras_dict_t gras_dict_new(void);
+void gras_dict_free(gras_dict_t *dict);
 
 
-gras_error_t gras_dict_set    (gras_dict_t    *head,
-			       const char     *key,
-			       void           *data,
-			       void_f_pvoid_t *free_ctn);
-gras_error_t gras_dict_set_ext(gras_dict_t    *head,
-			       const char     *key,
-			       int             key_len,
-			       void           *data,
-			       void_f_pvoid_t *free_ctn);
+void gras_dict_set    (gras_dict_t     head,
+		       const char     *key,
+		       void           *data,
+		       void_f_pvoid_t *free_ctn);
+void gras_dict_set_ext(gras_dict_t     head,
+		       const char     *key,
+		       int             key_len,
+		       void           *data,
+		       void_f_pvoid_t *free_ctn);
 
 /*----[ gras_dict_get ]------------------------------------------------------*/
 /* Search the given #key#. data=NULL when not found.                         */
 /* Returns true if anything went ok, and false on internal error.            */
 /*---------------------------------------------------------------------------*/
-gras_error_t gras_dict_get(gras_dict_t *head,const char *key,
+gras_error_t gras_dict_get(gras_dict_t head,const char *key,
 			   /* OUT */void **data);
-gras_error_t gras_dict_get_ext(gras_dict_t *head,const char *key,
+gras_error_t gras_dict_get_ext(gras_dict_t head,const char *key,
 			       int key_len,
 			       /* OUT */void **data);
 /*----[ gras_dict_remove ]---------------------------------------------------*/
 /* Remove the entry associated with the given #key#.                         */
 /* Returns if ok. Removing a non-existant key is ok.                         */
 /*---------------------------------------------------------------------------*/
-gras_error_t gras_dict_remove(gras_dict_t *head,const char *key);
+gras_error_t gras_dict_remove(gras_dict_t head,const char *key);
 
-gras_error_t gras_dict_remove_ext(gras_dict_t *head,const char *key,
-                                  int key_len);
+gras_error_t gras_dict_remove_ext(gras_dict_t head,
+				  const char *key, int key_len);
 
 /*----[ gras_dict_dump ]-----------------------------------------------------*/
 /* Outputs the content of the structure. (for debuging purpose)              */
 /* #output# is a function to output the data.If NULL, data won't be displayed*/
-/* Returns if it was ok or not                                               */
 /*---------------------------------------------------------------------------*/
-gras_error_t gras_dict_dump(gras_dict_t *head,
-			    void (*output)(void*));
+void gras_dict_dump(gras_dict_t head,
+		    void (*output)(void*));
 /*----[ gras_dict_print ]----------------------------------------------------*/
 /* To dump multicache, this function dump a cache                            */
 /*---------------------------------------------------------------------------*/
@@ -82,11 +81,11 @@ void gras_dict_prints(void *data);
 /* The key are destroyed in the process. Think to strdup it before.          */
 /* Returns if it was ok or not                                               */
 /*---------------------------------------------------------------------------*/
-gras_error_t gras_multidict_set(gras_dict_t **head,
+gras_error_t gras_multidict_set(gras_dict_t *head,
 				int keycount,char **key,
 				void *data,void (*free_ctn)(void*));
 
-gras_error_t gras_multidict_set_ext(gras_dict_t **head,
+gras_error_t gras_multidict_set_ext(gras_dict_t *head,
 				    int keycount,char **key,int *key_len,
 				    void *data,void_f_pvoid_t *free_ctn);
 
@@ -94,11 +93,11 @@ gras_error_t gras_multidict_set_ext(gras_dict_t **head,
 /* Search the given #key#. data=NULL when not found.                         */
 /* Returns true if anything went ok, and false on internal error.            */
 /*---------------------------------------------------------------------------*/
-gras_error_t gras_multidict_get(gras_dict_t *head,
+gras_error_t gras_multidict_get(gras_dict_t head,
 				int keycount,const char **key,
 				/* OUT */void **data);
 
-gras_error_t gras_multidict_get_ext(gras_dict_t *head,
+gras_error_t gras_multidict_get_ext(gras_dict_t head,
 				    int keycount,const char **key,int *key_len,
 				    /* OUT */void **data);
 
@@ -106,42 +105,40 @@ gras_error_t gras_multidict_get_ext(gras_dict_t *head,
 /* Remove the entry associated with the given #key#.                         */
 /* Returns if ok. Removing a non-existant key is ok.                         */
 /*---------------------------------------------------------------------------*/
-gras_error_t gras_multidict_remove(gras_dict_t *head,
+gras_error_t gras_multidict_remove(gras_dict_t head,
 				   int keycount,const char **key);
 
-gras_error_t gras_multidict_remove_ext(gras_dict_t *head,
+gras_error_t gras_multidict_remove_ext(gras_dict_t head,
                                        int keycount,const char **key,int *key_len);
 
 /*####[ Cache cursor functions ]#############################################*/
 /* To traverse (simple) caches                                               */
 /* Don't add or remove entries to the cache while traversing !!!             */
 /*###########################################################################*/
-typedef struct gras_dict_cursor_ gras_dict_cursor_t;
+typedef struct gras_dict_cursor_ *gras_dict_cursor_t;
 /* creator/destructor */
-gras_error_t gras_dict_cursor_new(const gras_dict_t *head,
-				  /*OUT*/gras_dict_cursor_t **cursor);
-void         gras_dict_cursor_free(gras_dict_cursor_t *cursor);
+gras_dict_cursor_t gras_dict_cursor_new(const gras_dict_t head);
+void               gras_dict_cursor_free(gras_dict_cursor_t *cursor);
 
 /* back to first element 
    it is not enough to reinit the cache after an add/remove in cache*/
-gras_error_t gras_dict_cursor_rewind(gras_dict_cursor_t *cursor);
+void gras_dict_cursor_rewind(gras_dict_cursor_t cursor);
 
 
-gras_error_t gras_dict_cursor_get_key     (gras_dict_cursor_t *cursor,
+gras_error_t gras_dict_cursor_get_key     (gras_dict_cursor_t cursor,
 					   /*OUT*/char **key);
-gras_error_t gras_dict_cursor_get_data    (gras_dict_cursor_t *cursor,
+gras_error_t gras_dict_cursor_get_data    (gras_dict_cursor_t cursor,
 					   /*OUT*/void **data);
 
-
-void         gras_dict_cursor_first       (const gras_dict_t   *dict,
-					   gras_dict_cursor_t **cursor);
-void         gras_dict_cursor_step        (gras_dict_cursor_t  *cursor);
-int          gras_dict_cursor_get_or_free (gras_dict_cursor_t **cursor,
-					   char               **key,
-					   void               **data);
-#define gras_dict_foreach(dict,cursor,key,data)                        \
-  for (cursor=NULL, gras_dict_cursor_first((dict),&(cursor)) ;         \
-       gras_dict_cursor_get_or_free(&(cursor),&(key),(void**)(&data)); \
+void gras_dict_cursor_first (const gras_dict_t   dict,
+			     gras_dict_cursor_t *cursor);
+void         gras_dict_cursor_step        (gras_dict_cursor_t  cursor);
+int          gras_dict_cursor_get_or_free (gras_dict_cursor_t *cursor,
+					   char              **key,
+					   void              **data);
+#define gras_dict_foreach(dict,cursor,key,data)                       \
+  for (cursor=NULL, gras_dict_cursor_first((dict),&(cursor)) ;        \
+       gras_dict_cursor_get_or_free(&(cursor),&(key),(void**)(&data));\
        gras_dict_cursor_step(cursor) )
 
 #ifdef  __cplusplus