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

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index b675d2b0e0..7ad68349fa 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -3,67 +3,67 @@
 /* dict_elm - elements of generic dictionnaries                             */
 /* This file is not to be loaded from anywhere but dict.c                   */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003,2004 Martin Quinson.                                  */
+/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _GRAS_DICT_ELM_T_
-#define _GRAS_DICT_ELM_T_
+#ifndef _XBT_DICT_ELM_T_
+#define _XBT_DICT_ELM_T_
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
+#include "xbt/ex.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
 /*####[ Type definition ]####################################################*/
-typedef struct gras_dictelm_ {
+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_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;
+  xbt_dynar_t    sub; /* sub */
+} s_xbt_dictelm_t, *xbt_dictelm_t;
 
-struct gras_dict_ {
-  gras_dictelm_t *head;
-};
+typedef struct xbt_dict_ {
+  s_xbt_dictelm_t *head;
+} s_xbt_dict_t;
+
+typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
 
 /*####[ Function prototypes ]################################################*/
-void gras_dictelm_free      (gras_dictelm_t **pp_elm);
+void  xbt_dictelm_free      (s_xbt_dictelm_t **pp_elm);
 
-void gras_dictelm_set       (gras_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 gras_dictelm_set_ext   (gras_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);
 
-gras_error_t gras_dictelm_get       (gras_dictelm_t *p_head,
-				     const char     *key,
-				     /* OUT */void **data);
-gras_error_t gras_dictelm_get_ext   (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,
-				     const char  *key);
-gras_error_t gras_dictelm_remove_ext(gras_dictelm_t *p_head,
-				       const char  *key,
-				       int          key_len);
-
-void         gras_dictelm_dump      (gras_dictelm_t *p_head,
+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);
 
-void         gras_dictelm_print_fct (void *data);
+void         xbt_dictelm_print_fct (void *data);
 
-#endif  /* _GRAS_DICT_ELM_T_ */
+#endif  /* _XBT_DICT_ELM_T_ */