X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48404c66fc4d8248308db1d1398cb79a6763077e..f81bbb7e5632a77045d9330d2f8988ea0c9d4564:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 80c8a6cf26..a9227b5542 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,6 +1,6 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2004-2011. The SimGrid Team. +/* Copyright (c) 2004-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -672,11 +672,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict); XBT_TEST_SUITE("dict", "Dict data container"); -static void print_str(void *str) -{ - printf("%s", (char *) PRINTF_STR(str)); -} - static void debuged_add_ext(xbt_dict_t head, const char *key, const char *data_to_fill, void_f_pvoid_t free_f) { @@ -723,14 +718,19 @@ static void search_ext(xbt_dict_t head, const char *key, const char *data) xbt_test_add("Search %s", key); found = xbt_dict_get(head, key); xbt_test_log("Found %s", (char *) found); - if (data) + if (data) { xbt_test_assert(found, - "data do not match expectations: found NULL while searching for %s", - data); - if (found) - xbt_test_assert(!strcmp((char *) data, found), - "data do not match expectations: found %s while searching for %s", - (char *) found, data); + "data do not match expectations: found NULL while searching for %s", + data); + if (found) + xbt_test_assert(!strcmp((char *) data, found), + "data do not match expectations: found %s while searching for %s", + (char *) found, data); + } else { + xbt_test_assert(!found, + "data do not match expectations: found %s while searching for NULL", + found); + } } static void search(xbt_dict_t head, const char *key)