A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move maestro to EngineImpl. breaks a unit-test
[simgrid.git]
/
src
/
xbt
/
dict_elm.c
diff --git
a/src/xbt/dict_elm.c
b/src/xbt/dict_elm.c
index dae75e88bfc5fc3cb6b9a7e0af5caabe821b1088..2421937ba4ec1d679752266ffdf26dceb9612ac6 100644
(file)
--- a/
src/xbt/dict_elm.c
+++ b/
src/xbt/dict_elm.c
@@
-1,24
+1,17
@@
/* dict - a generic dictionary, variation over hash table */
/* dict - a generic dictionary, variation over hash table */
-/* Copyright (c) 2004-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2021. 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. */
#include "dict_private.h" /* prototypes of this module */
/* 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 "dict_private.h" /* prototypes of this module */
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_elm, xbt_dict, "Dictionaries internals");
-
xbt_mallocator_t dict_elm_mallocator = NULL;
xbt_mallocator_t dict_elm_mallocator = NULL;
-xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len, unsigned int hash_code, void *content,
- void_f_pvoid_t free_f)
+xbt_dictelm_t xbt_dictelm_new(const char* key, int key_len, unsigned int hash_code, void* content)
{
{
- xbt_dictelm_t element;
-
- xbt_assert(!free_f, "Cannot set an individual free function in homogeneous dicts.");
- element = xbt_mallocator_get(dict_elm_mallocator);
+ xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator);
element->key = xbt_new(char, key_len + 1);
memcpy(element->key, key, key_len);
element->key[key_len] = '\0';
element->key = xbt_new(char, key_len + 1);
memcpy(element->key, key, key_len);
element->key[key_len] = '\0';
@@
-32,7
+25,7
@@
xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len, uns
return element;
}
return element;
}
-void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element)
+void xbt_dictelm_free(
const_
xbt_dict_t dict, xbt_dictelm_t element)
{
if (element) {
char *key = element->key;
{
if (element) {
char *key = element->key;
@@
-47,12
+40,9
@@
void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element)
}
}
}
}
-void xbt_dictelm_set_data(
xbt_dict_t dict, xbt_dictelm_t element, void *data, void_f_pvoid_t free_ctn
)
+void xbt_dictelm_set_data(
const_xbt_dict_t dict, xbt_dictelm_t element, void* data
)
{
{
- void_f_pvoid_t free_f;
- free_f = dict->free_f;
- xbt_assert(!free_ctn, "Cannot set an individual free function in homogeneous dicts.");
-
+ void_f_pvoid_t free_f = dict->free_f;
if (free_f && element->content)
free_f(element->content);
if (free_f && element->content)
free_f(element->content);