fix

[oweals/gnunet.git] / src / util / test_container_bloomfilter.c

diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c
index 9beb1129898c52b08adb89971984f13ba837c0ec..04bb3488901c933ade417d2e589a051856b51eea 100644 (file)
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -38,13 +38,13 @@
 static void
 nextHC (GNUNET_HashCode * hc)
 {
-  GNUNET_CRYPTO_hash_create_random (hc);
+  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, hc);
 }
 
 static int
-add_iterator (GNUNET_HashCode * next, void *arg)
+add_iterator (void *cls, GNUNET_HashCode * next)
 {
-  int *ret = arg;
+  int *ret = cls;
   GNUNET_HashCode pos;
 
   if (0 == (*ret)--)
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
   struct stat sbuf;
 
   GNUNET_log_setup ("test-container-bloomfilter", "WARNING", NULL);
-  srand (1);
+  SRANDOM (1);
   if (0 == stat (TESTFILE, &sbuf))
     if (0 != UNLINK (TESTFILE))
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink", TESTFILE);
@@ -79,18 +79,18 @@ main (int argc, char *argv[])
       nextHC (&tmp);
       GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);
     }
-  srand (1);
+  SRANDOM (1);
   ok1 = 0;
   for (i = 0; i < 200; i++)
     {
       nextHC (&tmp);
       if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
+       ok1++;
     }
   if (ok1 != 200)
     {
-      printf ("Got %d elements out of"
-              "200 expected after insertion.\n", ok1);
+      printf ("Got %d elements out of" "200 expected after insertion.\n",
+             ok1);
       GNUNET_CONTAINER_bloomfilter_free (bf);
       return -1;
     }
@@ -107,21 +107,21 @@ main (int argc, char *argv[])
   bfi = GNUNET_CONTAINER_bloomfilter_init (buf, SIZE, K);
   GNUNET_assert (bfi != NULL);
 
-  srand (1);
+  SRANDOM (1);
   ok1 = 0;
   ok2 = 0;
   for (i = 0; i < 200; i++)
     {
       nextHC (&tmp);
       if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
+       ok1++;
       if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-        ok2++;
+       ok2++;
     }
   if (ok1 != 200)
     {
-      printf ("Got %d elements out of 200 "
-              "expected after reloading.\n", ok1);
+      printf ("Got %d elements out of 200 " "expected after reloading.\n",
+             ok1);
       GNUNET_CONTAINER_bloomfilter_free (bf);
       GNUNET_CONTAINER_bloomfilter_free (bfi);
       return -1;
@@ -130,13 +130,13 @@ main (int argc, char *argv[])
   if (ok2 != 200)
     {
       printf ("Got %d elements out of 200 "
-              "expected after initialization.\n", ok2);
+             "expected after initialization.\n", ok2);
       GNUNET_CONTAINER_bloomfilter_free (bf);
       GNUNET_CONTAINER_bloomfilter_free (bfi);
       return -1;
     }
 
-  srand (1);
+  SRANDOM (1);
   for (i = 0; i < 100; i++)
     {
       nextHC (&tmp);
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
       GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);
     }
 
-  srand (1);
+  SRANDOM (1);
 
   ok1 = 0;
   ok2 = 0;
@@ -152,15 +152,15 @@ main (int argc, char *argv[])
     {
       nextHC (&tmp);
       if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
+       ok1++;
       if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-        ok2++;
+       ok2++;
     }
 
   if (ok1 != 100)
     {
       printf ("Expected 100 elements in loaded filter"
-              " after adding 200 and deleting 100, got %d\n", ok1);
+             " after adding 200 and deleting 100, got %d\n", ok1);
       GNUNET_CONTAINER_bloomfilter_free (bf);
       GNUNET_CONTAINER_bloomfilter_free (bfi);
       return -1;
@@ -168,15 +168,15 @@ main (int argc, char *argv[])
   if (ok2 != 200)
     {
       printf ("Expected 200 elements in initialized filter"
-              " after adding 200 and deleting 100 "
-              "(which should do nothing for a filter not backed by a file), got %d\n",
-              ok2);
+             " after adding 200 and deleting 100 "
+             "(which should do nothing for a filter not backed by a file), got %d\n",
+             ok2);
       GNUNET_CONTAINER_bloomfilter_free (bf);
       GNUNET_CONTAINER_bloomfilter_free (bfi);
       return -1;
     }
 
-  srand (3);
+  SRANDOM (3);
 
   GNUNET_CONTAINER_bloomfilter_clear (bf);
   falseok = 0;
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
     {
       nextHC (&tmp);
       if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        falseok++;
+       falseok++;
     }
   if (falseok > 0)
     {
@@ -200,14 +200,14 @@ main (int argc, char *argv[])
       return -1;
     }
 
-  srand (2);
+  SRANDOM (2);
   i = 20;
   GNUNET_CONTAINER_bloomfilter_resize (bfi, &add_iterator, &i, SIZE * 2, K);
 
-  srand (2);
+  SRANDOM (2);
   i = 20;
   GNUNET_CONTAINER_bloomfilter_resize (bf, &add_iterator, &i, SIZE * 2, K);
-  srand (2);
+  SRANDOM (2);
 
   ok1 = 0;
   ok2 = 0;
@@ -215,15 +215,15 @@ main (int argc, char *argv[])
     {
       nextHC (&tmp);
       if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
+       ok1++;
       if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-        ok2++;
+       ok2++;
     }
 
   if (ok1 != 20)
     {
       printf ("Expected 20 elements in resized file-backed filter"
-              " after adding 20, got %d\n", ok1);
+             " after adding 20, got %d\n", ok1);
       GNUNET_CONTAINER_bloomfilter_free (bf);
       GNUNET_CONTAINER_bloomfilter_free (bfi);
       return -1;
@@ -231,7 +231,7 @@ main (int argc, char *argv[])
   if (ok2 != 20)
     {
       printf ("Expected 20 elements in resized filter"
-              " after adding 20, got %d\n", ok2);
+             " after adding 20, got %d\n", ok2);
       GNUNET_CONTAINER_bloomfilter_free (bf);
       GNUNET_CONTAINER_bloomfilter_free (bfi);
       return -1;