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
[XBT] Amended docs for xbt/dict
[simgrid.git]
/
src
/
xbt
/
dict.c
diff --git
a/src/xbt/dict.c
b/src/xbt/dict.c
index
d59086b
..
95bda63
100644
(file)
--- a/
src/xbt/dict.c
+++ b/
src/xbt/dict.c
@@
-1,6
+1,6
@@
/* dict - a generic dictionary, variation over hash table */
/* dict - a generic dictionary, variation over hash table */
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,17
+11,17
@@
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/mallocator.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/mallocator.h"
-#include "xbt_modinter.h"
+#include "
src/
xbt_modinter.h"
#include "xbt/str.h"
#include "dict_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt,
#include "xbt/str.h"
#include "dict_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt,
- "Dictionaries provide the same functionalities
than
hash tables");
+ "Dictionaries provide the same functionalities
as
hash tables");
/**
* \brief Constructor
* \return pointer to the destination
/**
* \brief Constructor
* \return pointer to the destination
- * \see xbt_dict_free()
+ * \see xbt_dict_
new_homogenous(), xbt_dict_
free()
*
* Creates and initialize a new dictionary with a default hashtable size.
* The dictionary is heterogeneous: each element can have a different free
*
* Creates and initialize a new dictionary with a default hashtable size.
* The dictionary is heterogeneous: each element can have a different free
@@
-156,7
+156,9
@@
static void xbt_dict_rehash(xbt_dict_t dict)
* \param key_len the size of the \a key
* \param data the data to add in the dict
* \param free_ctn function to call with (\a data as argument) when
* \param key_len the size of the \a key
* \param data the data to add in the dict
* \param free_ctn function to call with (\a data as argument) when
- * \a data is removed from the dictionary
+ * \a data is removed from the dictionary. This param
+ * will only be considered when the dict was instantiated with
+ * xbt_dict_new() and not xbt_dict_new_homogeneous()
*
* Set the \a data in the structure under the \a key, which can be any kind
* of data, as long as its length is provided in \a key_len.
*
* Set the \a data in the structure under the \a key, which can be any kind
* of data, as long as its length is provided in \a key_len.
@@
-210,7
+212,9
@@
XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict,
* \param key the key to set the new data
* \param data the data to add in the dict
* \param free_ctn function to call with (\a data as argument) when
* \param key the key to set the new data
* \param data the data to add in the dict
* \param free_ctn function to call with (\a data as argument) when
- * \a data is removed from the dictionary
+ * \a data is removed from the dictionary. This param
+ * will only be considered when the dict was instantiated with
+ * xbt_dict_new() and not xbt_dict_new_homogeneous()
*
* set the \a data in the structure under the \a key, which is a
* null terminated string.
*
* set the \a data in the structure under the \a key, which is a
* null terminated string.
@@
-676,7
+680,9
@@
void xbt_dict_postexit(void)
#ifdef SIMGRID_TEST
#include "xbt.h"
#include "xbt/ex.h"
#ifdef SIMGRID_TEST
#include "xbt.h"
#include "xbt/ex.h"
-#include "portable.h"
+#include "src/portable.h"
+
+#define PRINTF_STR(a) (a)?:"(null)"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
@@
-822,7
+828,7
@@
static void count_check_get_key(xbt_dict_t dict, int length)
{
xbt_dict_cursor_t cursor;
char *key;
{
xbt_dict_cursor_t cursor;
char *key;
-
_XBT_GNUC
_UNUSED char *key2;
+
XBT_ATTRIB
_UNUSED char *key2;
void *data;
int effective = 0;
void *data;
int effective = 0;