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
Removed unused functions from xbt_str.
[simgrid.git]
/
src
/
xbt
/
dict.cpp
diff --git
a/src/xbt/dict.cpp
b/src/xbt/dict.cpp
index
7436c33
..
485641c
100644
(file)
--- a/
src/xbt/dict.cpp
+++ b/
src/xbt/dict.cpp
@@
-6,8
+6,8
@@
/* 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. */
-#include <
string.h
>
-#include <
stdio.h
>
+#include <
cstdio
>
+#include <
cstring
>
#include "xbt/dict.h"
#include "xbt/ex.h"
#include "xbt/dict.h"
#include "xbt/ex.h"
@@
-103,7
+103,7
@@
static void xbt_dict_rehash(xbt_dict_t dict)
newsize--;
dict->table_size = newsize;
dict->table = currcell;
newsize--;
dict->table_size = newsize;
dict->table = currcell;
- XBT_DEBUG("REHASH (%
d->%d
)", oldsize, newsize);
+ XBT_DEBUG("REHASH (%
u->%u
)", oldsize, newsize);
for (unsigned i = 0; i < oldsize; i++, currcell++) {
if (*currcell == nullptr) /* empty cell */
for (unsigned i = 0; i < oldsize; i++, currcell++) {
if (*currcell == nullptr) /* empty cell */
@@
-554,11
+554,11
@@
void xbt_dict_postexit()
}
#ifdef SIMGRID_TEST
}
#ifdef SIMGRID_TEST
-#include
<time.h>
+#include
"src/internal_config.h"
#include "xbt.h"
#include "xbt/ex.h"
#include "xbt.h"
#include "xbt/ex.h"
+#include <ctime>
#include <xbt/ex.hpp>
#include <xbt/ex.hpp>
-#include "src/internal_config.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
@@
-638,7
+638,7
@@
static void traverse(xbt_dict_t head)
} else {
xbt_test_log("Seen #%d: %s", ++i, key);
}
} else {
xbt_test_log("Seen #%d: %s", ++i, key);
}
- xbt_test_assert(
not data || not strcmp(key, data)
, "Key(%s) != value(%s). Aborting", key, data);
+ xbt_test_assert(
key && data && strcmp(key, data) == 0
, "Key(%s) != value(%s). Aborting", key, data);
}
}
}
}
@@
-750,8
+750,7
@@
XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and trave
/* RETRIEVE */
xbt_test_add("Search 123");
char* data = (char*)xbt_dict_get(head, "123");
/* RETRIEVE */
xbt_test_add("Search 123");
char* data = (char*)xbt_dict_get(head, "123");
- xbt_test_assert(data);
- xbt_test_assert(not strcmp("123", data));
+ xbt_test_assert(data && strcmp("123", data) == 0);
search_not_found(head, "Can't be found");
search_not_found(head, "123 Can't be found");
search_not_found(head, "Can't be found");
search_not_found(head, "123 Can't be found");
@@
-864,7
+863,7
@@
XBT_TEST_UNIT("nulldata", test_dict_nulldata, "nullptr data management")
xbt_test_log("Seen: %s", key);
}
xbt_test_log("Seen: %s", key);
}
- if (
not strcmp(key, "null")
)
+ if (
key && strcmp(key, "null") == 0
)
found = 1;
}
xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
found = 1;
}
xbt_test_assert(found, "the key 'null', associated to nullptr is not found");