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
do not trim in split_quoted, that's expensive, and the caller can do it if his input...
[simgrid.git]
/
src
/
xbt
/
dict_elm.c
diff --git
a/src/xbt/dict_elm.c
b/src/xbt/dict_elm.c
index
91d245e
..
4129989
100644
(file)
--- a/
src/xbt/dict_elm.c
+++ b/
src/xbt/dict_elm.c
@@
-1,8
+1,7
@@
-/* $Id$ */
-
/* dict - a generic dictionary, variation over the B-tree concept */
/* dict - a generic dictionary, variation over the B-tree concept */
-/* Copyright (c) 2003-2009 The SimGrid team. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
/* 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. */
@@
-31,9
+30,9
@@
xbt_dictelm_t xbt_dictelm_new(const char *key,
{
xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator);
{
xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator);
- element->dictielem = 0; /* please free the key on free */
+ element->dictielem = 0;
/* please free the key on free */
element->key = xbt_new(char, key_len + 1);
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;
element->key[key_len] = '\0';
element->key_len = key_len;
@@
-46,16
+45,18
@@
xbt_dictelm_t xbt_dictelm_new(const char *key,
return element;
}
return element;
}
-xbt_dictelm_t xbt_dictielm_new(uintptr_t key, unsigned int hash_code, uintptr_t content) {
+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);
xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator);
- element->key = (void
*)
key;
+ element->key = (void
*)
key;
- element->dictielem = 1; /* please DONT free the key on free */
+ element->dictielem = 1;
/* please DONT free the key on free */
element->key_len = sizeof(uintptr_t);
element->hash_code = hash_code;
element->key_len = sizeof(uintptr_t);
element->hash_code = hash_code;
- element->content = (void
*)
content;
+ element->content = (void
*)
content;
element->free_f = NULL;
element->next = NULL;
element->free_f = NULL;
element->next = NULL;