The change Arnaud wanted so much: Big Star Eradication (plus some more, check the...

[simgrid.git] / src / xbt / dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index b675d2b..04484bc 100644 (file)
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -24,43 +24,45 @@ typedef struct gras_dictelm_ {
   int             key_len;
   int             offset; /* offset on the key */
   void           *content;
-  void_f_pvoid_t *free_ctn; /*pointer to the function to call to free this ctn*/
+  void_f_pvoid_t *free_f; /*pointer to the function to call to free this ctn*/
 
-  gras_dynar_t   *sub; /* sub */
-} gras_dictelm_t;
+  gras_dynar_t    sub; /* sub */
+} s_gras_dictelm_t, *gras_dictelm_t;
 
-struct gras_dict_ {
-  gras_dictelm_t *head;
-};
+typedef struct gras_dict_ {
+  s_gras_dictelm_t *head;
+} s_gras_dict_t;
+
+typedef struct gras_dict_cursor_ s_gras_dict_cursor_t;
 
 /*####[ Function prototypes ]################################################*/
-void gras_dictelm_free      (gras_dictelm_t **pp_elm);
+void gras_dictelm_free      (s_gras_dictelm_t **pp_elm);
 
-void gras_dictelm_set       (gras_dictelm_t **pp_head,
+void gras_dictelm_set       (s_gras_dictelm_t **pp_head,
                             const char      *_key,
                             void            *data,
                             void_f_pvoid_t  *free_ctn);
-void gras_dictelm_set_ext   (gras_dictelm_t **pp_head,
+void gras_dictelm_set_ext   (s_gras_dictelm_t **pp_head,
                             const char      *_key,
                             int              key_len,
                             void            *data,
                             void_f_pvoid_t  *free_ctn);
 
-gras_error_t gras_dictelm_get       (gras_dictelm_t *p_head,
+gras_error_t gras_dictelm_get       (s_gras_dictelm_t *p_head,
                                     const char     *key,
                                     /* OUT */void **data);
-gras_error_t gras_dictelm_get_ext   (gras_dictelm_t *p_head,
+gras_error_t gras_dictelm_get_ext   (s_gras_dictelm_t *p_head,
                                     const char     *key,
                                     int             key_len,
                                     /* OUT */void **data);
 
-gras_error_t gras_dictelm_remove    (gras_dictelm_t *p_head,
+gras_error_t gras_dictelm_remove    (s_gras_dictelm_t *p_head,
                                     const char  *key);
-gras_error_t gras_dictelm_remove_ext(gras_dictelm_t *p_head,
+gras_error_t gras_dictelm_remove_ext(s_gras_dictelm_t *p_head,
                                       const char  *key,
                                       int          key_len);
 
-void         gras_dictelm_dump      (gras_dictelm_t *p_head,
+void         gras_dictelm_dump      (s_gras_dictelm_t *p_head,
                                     void_f_pvoid_t *output);
 
 void         gras_dictelm_print_fct (void *data);