Change parameter names from 'head' to 'dict'. Add two functions: xbt_dict_reset(...

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

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index 686f396..a25f957 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -20,9 +20,8 @@ SG_BEGIN_DECL()
  *  @brief The dictionnary data structure (comparable to hash tables)
  * 
  *  This section describes the API to a dictionnary structure that
- *  associates as string to a void* key. Even if it provides the same
- *  functionnality than an hash table, the implementation differs and the
- *  internal data-structure rather looks like a tree.
+ *  associates as string to a void* key. It provides the same
+ *  functionnality than an hash table.
  * 
  *  Here is a little example of use:
  *  \verbatim xbt_dict_t mydict = xbt_dict_new();
@@ -46,7 +45,9 @@ SG_BEGIN_DECL()
   /** \brief Dictionnary data type (opaque structure) */
   typedef struct xbt_dict_ *xbt_dict_t;
   xbt_dict_t xbt_dict_new(void);
+  xbt_dict_t xbt_dict_new_ext(int hashsize);
   void xbt_dict_free(xbt_dict_t *dict);
+  void xbt_dict_hashsize_set(xbt_dict_t dict, int hashsize);
 
 /** @} */
 /** @defgroup XBT_dict_basic Dictionnaries basic usage
@@ -57,12 +58,14 @@ SG_BEGIN_DECL()
  *  @{
  */
 
-  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_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t *free_ctn);
+  void *xbt_dict_get(xbt_dict_t dict,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*));
+  void xbt_dict_remove(xbt_dict_t dict, const char *key);
+  void xbt_dict_reset(xbt_dict_t dict);
+  int xbt_dict_length(xbt_dict_t dict);
+  void xbt_dict_dump(xbt_dict_t dict, void (*output)(void*));
   
 /** @} */
 /** @defgroup XBT_dict_nnul Dictionnaries with non-nul terminated keys
@@ -72,12 +75,12 @@ SG_BEGIN_DECL()
  *
  *  @{
  */
-  void  xbt_dict_set_ext(xbt_dict_t     head,
+  void  xbt_dict_set_ext(xbt_dict_t     dict,
                         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);
+  void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len);
+  void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len);
 
 
 /** @} */
@@ -93,7 +96,7 @@ SG_BEGIN_DECL()
 \verbatim xbt_dict_cursor_t cursor=NULL;
  char *key,*data;
 
- xbt_dict_foreach(head,cursor,key,data) {
+ xbt_dict_foreach(dict,cursor,key,data) {
     printf("   - Seen:  %s->%s\n",key,data);
  }\endverbatim
 
@@ -104,7 +107,7 @@ SG_BEGIN_DECL()
 
   /** @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);
+  xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict);
   void               xbt_dict_cursor_free(xbt_dict_cursor_t *cursor);
 
   void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor);