Current state. See changelog, sorry, I'm out of time

[simgrid.git] / src / xbt / dict.c

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 3657cb0..101a08a 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -8,8 +8,6 @@
 /* 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. */
 
-
-#include "gras_private.h"
 #include "dict_private.h"
 
 #include <stdlib.h> /* malloc() */
@@ -17,7 +15,7 @@
 
 #include <stdio.h>
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(dict,gros,
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(dict,xbt,
    "Dictionaries provide the same functionnalities than hash tables");
 
 /*####[ Private prototypes ]#################################################*/
@@ -32,18 +30,11 @@ GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(dict,gros,
  *
  * Creates and initialize a new dictionnary
  */
-gras_error_t
-gras_dict_new(gras_dict_t **whereto) {
-  gras_dict_t *dict;
-
-  if (!(dict = calloc(1, sizeof(gras_dict_t))))
-    RAISE_MALLOC;
-
-  dict->head=NULL;
-
-  *whereto = dict;
-  
-  return no_error;
+gras_dict_t *
+gras_dict_new(void) {
+  gras_dict_t *res= gras_new(gras_dict_t,1);
+  res->head=NULL;
+  return res;
 }
 /**
  * gras_dict_free:
@@ -74,17 +65,17 @@ gras_dict_free(gras_dict_t **dict)  {
  * set the @data in the structure under the @key, which can be any kind 
  * of data, as long as its length is provided in @key_len.
  */
-gras_error_t
+void
 gras_dict_set_ext(gras_dict_t     *p_dict,
-                    const char      *key,
-                    int              key_len,
-                    void            *data,
-                    void_f_pvoid_t  *free_ctn) {
+                 const char      *key,
+                 int              key_len,
+                 void            *data,
+                 void_f_pvoid_t  *free_ctn) {
 
   gras_assert(p_dict);
 
-  return gras_dictelm_set_ext(&(p_dict->head),
-                                key, key_len, data, free_ctn);
+  gras_dictelm_set_ext(&(p_dict->head),
+                      key, key_len, data, free_ctn);
 }
 
 /**
@@ -98,7 +89,7 @@ gras_dict_set_ext(gras_dict_t     *p_dict,
  * set the @data in the structure under the @key, which is a 
  * null terminated string.
  */
-gras_error_t
+void
 gras_dict_set(gras_dict_t    *p_dict,
                 const char     *key,
                 void           *data,
@@ -106,7 +97,7 @@ gras_dict_set(gras_dict_t    *p_dict,
 
   gras_assert(p_dict);
   
-  return gras_dictelm_set(&(p_dict->head), key, data, free_ctn);
+  gras_dictelm_set(&(p_dict->head), key, data, free_ctn);
 }
 
 /**
@@ -198,11 +189,11 @@ gras_dict_remove(gras_dict_t *dict,
  * function to output the data. If NULL, data won't be displayed.
  */
 
-gras_error_t
+void
 gras_dict_dump(gras_dict_t    *dict,
                void_f_pvoid_t *output) {
 
   printf("Dict %p:\n", (void*)dict);
-  return gras_dictelm_dump(dict ? dict->head: NULL, output);
+  gras_dictelm_dump(dict ? dict->head: NULL, output);
 }