Don't hide variables with multiple declarations.

[simgrid.git] / src / xbt / dict.c

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 04f969d..b66c85a 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -495,6 +495,7 @@ XBT_INLINE void xbt_dict_remove(xbt_dict_t dict, const char *key)
   xbt_dict_remove_ext(dict, key, strlen(key));
 }
 
+#ifdef XBT_USE_DEPRECATED
 /**
  * \brief Add data to the dict (arbitrary key)
  * \param dict the container
@@ -529,7 +530,7 @@ XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key)
 {
   xbt_dict_remove_ext(dict, (void *)&key, sizeof key);
 }
-
+#endif
 
 /**
  * \brief Remove all data from the dict
@@ -1123,48 +1124,6 @@ XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management")
   xbt_dict_free(&head);
 }
 
-static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data)
-{
-  uintptr_t stored_data = 0;
-  xbt_test_log("Add %zu under %zu", data, key);
-
-  xbt_dicti_set(head, key, data);
-  if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) {
-    xbt_dict_dump(head, (void (*)(void *)) &printf);
-    fflush(stdout);
-  }
-  stored_data = xbt_dicti_get(head, key);
-  xbt_test_assert(stored_data == data,
-                   "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")
-{
-  xbt_test_add("Fill in the dictionnary");
-
-  head = xbt_dict_new();
-  debuged_addi(head, 12, 12);
-  debuged_addi(head, 13, 13);
-  debuged_addi(head, 14, 14);
-  debuged_addi(head, 15, 15);
-  /* Change values */
-  debuged_addi(head, 12, 15);
-  debuged_addi(head, 15, 2000);
-  debuged_addi(head, 15, 3000);
-  /* 0 as key */
-  debuged_addi(head, 0, 1000);
-  debuged_addi(head, 0, 2000);
-  debuged_addi(head, 0, 3000);
-  /* 0 as value */
-  debuged_addi(head, 12, 0);
-  debuged_addi(head, 13, 0);
-  debuged_addi(head, 12, 0);
-  debuged_addi(head, 0, 0);
-
-  xbt_dict_free(&head);
-}
-
 #define NB_ELM 20000
 #define SIZEOFKEY 1024
 static int countelems(xbt_dict_t head)
@@ -1185,7 +1144,6 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
   xbt_dict_t head = NULL;
   int i, j, k;
   char *key;
-  void *data;
 
   srand((unsigned int) time(NULL));
 
@@ -1246,6 +1204,7 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
   xbt_test_add("Search my %d elements 20 times", NB_ELM);
   key = xbt_malloc(10);
   for (i = 0; i < 20; i++) {
+    void *data;
     /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
     for (j = 0; j < NB_ELM; j++) {
 
@@ -1277,83 +1236,4 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
   xbt_dict_free(&head);
 }
 
-static void str_free(void *s)
-{
-  char *c = *(char **) s;
-  free(c);
-}
-
-XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test")
-{
-
-#undef NB_ELM
-#define NB_ELM 100              /*00 */
-#define DEPTH 5
-#define KEY_SIZE 512
-#define NB_TEST 20              /*20 */
-  int verbose = 0;
-
-  xbt_dict_t mdict = NULL;
-  int i, j, k, l;
-  xbt_dynar_t keys = xbt_dynar_new(sizeof(char *), str_free);
-  void *data;
-  char *key;
-
-
-  xbt_test_add("Generic multicache CRASH test");
-  xbt_test_log
-      (" Fill the struct and frees it %d times, using %d elements, "
-       "depth of multicache=%d, key size=%d", NB_TEST, NB_ELM, DEPTH,
-       KEY_SIZE);
-
-  for (l = 0; l < DEPTH; l++) {
-    key = xbt_malloc(KEY_SIZE);
-    xbt_dynar_push(keys, &key);
-  }
-
-  for (i = 0; i < NB_TEST; i++) {
-    mdict = xbt_dict_new();
-    XBT_VERB("mdict=%p", mdict);
-    if (verbose > 0)
-      printf("Test %d\n", i);
-    /* else if (i%10) printf("."); else printf("%d",i/10); */
-
-    for (j = 0; j < NB_ELM; j++) {
-      if (verbose > 0)
-        printf("  Add {");
-
-      for (l = 0; l < DEPTH; l++) {
-        key = *(char **) xbt_dynar_get_ptr(keys, l);
-
-        for (k = 0; k < KEY_SIZE - 1; k++)
-          key[k] = rand() % ('z' - 'a') + 'a';
-
-        key[k] = '\0';
-
-        if (verbose > 0)
-          printf("%p=%s %s ", key, key, (l < DEPTH - 1 ? ";" : "}"));
-      }
-      if (verbose > 0)
-        printf("in multitree %p.\n", mdict);
-
-      xbt_multidict_set(mdict, keys, xbt_strdup(key), free);
-
-      data = xbt_multidict_get(mdict, keys);
-
-      xbt_test_assert(data && !strcmp((char *) data, key),
-                       "Retrieved value (%s) does not match the given one (%s)\n",
-                       (char *) data, key);
-    }
-    xbt_dict_free(&mdict);
-  }
-
-  xbt_dynar_free(&keys);
-
-  /*  if (verbose>0)
-     xbt_dict_dump(mdict,&xbt_dict_print); */
-
-  xbt_dict_free(&mdict);
-  xbt_dynar_free(&keys);
-
-}
 #endif                          /* SIMGRID_TEST */