X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4d5cc7d545d867f635adb508301e61a2c86155e..acbb75da93aabcc72d26ea4a40de0055264bf24c:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 602ef21b2a..150bf69d00 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,6 +1,7 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2003-2010 Martin Quinson. 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. */ @@ -510,7 +511,7 @@ XBT_INLINE void xbt_dicti_set(xbt_dict_t dict, xbt_dictelm_t current, previous = NULL; xbt_assert(dict); - DEBUG5("ADD %ld->%ld; hash = %d, size = %d, & = %d", key, data, hash_code, + DEBUG5("ADD %zu->%zu; hash = %d, size = %d, & = %d", key, data, hash_code, dict->table_size, hash_code & dict->table_size); current = dict->table[hash_code & dict->table_size]; while (current != NULL && @@ -587,7 +588,7 @@ XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key) { } if (current == NULL) - THROW1(not_found_error, 0, "key %ld not found", key); + THROW1(not_found_error, 0, "key %zu not found", key); if (previous != NULL) { previous->next = current->next; @@ -1150,7 +1151,7 @@ XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management") } static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) { - xbt_test_log2("Add %ld under %ld", data, key); + xbt_test_log2("Add %zu under %zu", data, key); xbt_dicti_set(head, key, data); if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) { @@ -1159,7 +1160,7 @@ static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) { } uintptr_t stored_data = xbt_dicti_get(head, key); xbt_test_assert3(stored_data==data, - "Retrieved data (%ld) is not what I just stored (%ld) under key %ld",stored_data,data,key); + "Retrieved data (%zu) is not what I just stored (%zu) under key %zu",stored_data,data,key); } XBT_TEST_UNIT("dicti", test_dict_scalar, "Scalar data and key management")