-/* dict - a generic dictionary, variation over the B-tree concept */
+/* dict - a generic dictionary, variation over hash table */
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2011. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
{
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);
element->key[key_len] = '\0';
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);