Rewrite integer dicts using regular dicts.

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

diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c
index 497cf51..cda2c44 100644 (file)
--- a/src/xbt/dict_elm.c
+++ b/src/xbt/dict_elm.c
@@ -1,6 +1,7 @@
-/* dict - a generic dictionary, variation over the B-tree concept           */
+/* dict - a generic dictionary, variation over hash table                   */
 
-/* Copyright (c) 2003-2009 The SimGrid team. All rights reserved.           */
+/* Copyright (c) 2004-2011. The SimGrid Team.
+ * 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. */
@@ -29,9 +30,8 @@ xbt_dictelm_t xbt_dictelm_new(const char *key,
 {
   xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator);
 
-  element->dictielem = 0; /* please free the key on free */
   element->key = xbt_new(char, key_len + 1);
-  memcpy((void *)element->key, (void *)key, key_len);
+  memcpy((void *) element->key, (void *) key, key_len);
   element->key[key_len] = '\0';
 
   element->key_len = key_len;
@@ -44,27 +44,10 @@ xbt_dictelm_t xbt_dictelm_new(const char *key,
   return element;
 }
 
-xbt_dictelm_t xbt_dictielm_new(uintptr_t key, unsigned int hash_code, uintptr_t content) {
-  xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator);
-
-  element->key = (void*)key;
-
-  element->dictielem = 1; /* please DONT free the key on free */
-  element->key_len = sizeof(uintptr_t);
-  element->hash_code = hash_code;
-
-  element->content = (void*)content;
-  element->free_f = NULL;
-  element->next = NULL;
-
-  return element;
-}
-
 void xbt_dictelm_free(xbt_dictelm_t element)
 {
   if (element != NULL) {
-    if (!element->dictielem)
-      xbt_free(element->key);
+    xbt_free(element->key);
 
     if (element->free_f != NULL && element->content != NULL) {
       element->free_f(element->content);
@@ -78,13 +61,3 @@ void *dict_elm_mallocator_new_f(void)
 {
   return xbt_new(s_xbt_dictelm_t, 1);
 }
-
-void dict_elm_mallocator_free_f(void *elem)
-{
-  xbt_free(elem);
-}
-
-void dict_elm_mallocator_reset_f(void *elem)
-{
-
-}