diff options
Diffstat (limited to 'src/util/test_container_bloomfilter.c')
-rw-r--r-- | src/util/test_container_bloomfilter.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c index 42849af97..043eacafd 100644 --- a/src/util/test_container_bloomfilter.c +++ b/src/util/test_container_bloomfilter.c | |||
@@ -35,13 +35,13 @@ | |||
35 | * Generate a random hashcode. | 35 | * Generate a random hashcode. |
36 | */ | 36 | */ |
37 | static void | 37 | static void |
38 | nextHC (struct GNUNET_HashCode * hc) | 38 | nextHC (struct GNUNET_HashCode *hc) |
39 | { | 39 | { |
40 | GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, hc); | 40 | GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, hc); |
41 | } | 41 | } |
42 | 42 | ||
43 | static int | 43 | static int |
44 | add_iterator (void *cls, struct GNUNET_HashCode * next) | 44 | add_iterator (void *cls, struct GNUNET_HashCode *next) |
45 | { | 45 | { |
46 | int *ret = cls; | 46 | int *ret = cls; |
47 | struct GNUNET_HashCode pos; | 47 | struct GNUNET_HashCode pos; |
@@ -68,8 +68,8 @@ main (int argc, char *argv[]) | |||
68 | 68 | ||
69 | GNUNET_log_setup ("test-container-bloomfilter", "WARNING", NULL); | 69 | GNUNET_log_setup ("test-container-bloomfilter", "WARNING", NULL); |
70 | GNUNET_CRYPTO_seed_weak_random (1); | 70 | GNUNET_CRYPTO_seed_weak_random (1); |
71 | if (0 == STAT (TESTFILE, &sbuf)) | 71 | if (0 == stat (TESTFILE, &sbuf)) |
72 | if (0 != UNLINK (TESTFILE)) | 72 | if (0 != unlink (TESTFILE)) |
73 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink", TESTFILE); | 73 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink", TESTFILE); |
74 | bf = GNUNET_CONTAINER_bloomfilter_load (TESTFILE, SIZE, K); | 74 | bf = GNUNET_CONTAINER_bloomfilter_load (TESTFILE, SIZE, K); |
75 | 75 | ||
@@ -88,7 +88,9 @@ main (int argc, char *argv[]) | |||
88 | } | 88 | } |
89 | if (ok1 != 200) | 89 | if (ok1 != 200) |
90 | { | 90 | { |
91 | printf ("Got %d elements out of" "200 expected after insertion.\n", ok1); | 91 | printf ("Got %d elements out of" |
92 | "200 expected after insertion.\n", | ||
93 | ok1); | ||
92 | GNUNET_CONTAINER_bloomfilter_free (bf); | 94 | GNUNET_CONTAINER_bloomfilter_free (bf); |
93 | return -1; | 95 | return -1; |
94 | } | 96 | } |
@@ -118,7 +120,9 @@ main (int argc, char *argv[]) | |||
118 | } | 120 | } |
119 | if (ok1 != 200) | 121 | if (ok1 != 200) |
120 | { | 122 | { |
121 | printf ("Got %d elements out of 200 " "expected after reloading.\n", ok1); | 123 | printf ("Got %d elements out of 200 " |
124 | "expected after reloading.\n", | ||
125 | ok1); | ||
122 | GNUNET_CONTAINER_bloomfilter_free (bf); | 126 | GNUNET_CONTAINER_bloomfilter_free (bf); |
123 | GNUNET_CONTAINER_bloomfilter_free (bfi); | 127 | GNUNET_CONTAINER_bloomfilter_free (bfi); |
124 | return -1; | 128 | return -1; |
@@ -126,7 +130,8 @@ main (int argc, char *argv[]) | |||
126 | 130 | ||
127 | if (ok2 != 200) | 131 | if (ok2 != 200) |
128 | { | 132 | { |
129 | printf ("Got %d elements out of 200 " "expected after initialization.\n", | 133 | printf ("Got %d elements out of 200 " |
134 | "expected after initialization.\n", | ||
130 | ok2); | 135 | ok2); |
131 | GNUNET_CONTAINER_bloomfilter_free (bf); | 136 | GNUNET_CONTAINER_bloomfilter_free (bf); |
132 | GNUNET_CONTAINER_bloomfilter_free (bfi); | 137 | GNUNET_CONTAINER_bloomfilter_free (bfi); |
@@ -157,7 +162,8 @@ main (int argc, char *argv[]) | |||
157 | if (ok1 != 100) | 162 | if (ok1 != 100) |
158 | { | 163 | { |
159 | printf ("Expected 100 elements in loaded filter" | 164 | printf ("Expected 100 elements in loaded filter" |
160 | " after adding 200 and deleting 100, got %d\n", ok1); | 165 | " after adding 200 and deleting 100, got %d\n", |
166 | ok1); | ||
161 | GNUNET_CONTAINER_bloomfilter_free (bf); | 167 | GNUNET_CONTAINER_bloomfilter_free (bf); |
162 | GNUNET_CONTAINER_bloomfilter_free (bfi); | 168 | GNUNET_CONTAINER_bloomfilter_free (bfi); |
163 | return -1; | 169 | return -1; |
@@ -220,7 +226,8 @@ main (int argc, char *argv[]) | |||
220 | if (ok1 != 20) | 226 | if (ok1 != 20) |
221 | { | 227 | { |
222 | printf ("Expected 20 elements in resized file-backed filter" | 228 | printf ("Expected 20 elements in resized file-backed filter" |
223 | " after adding 20, got %d\n", ok1); | 229 | " after adding 20, got %d\n", |
230 | ok1); | ||
224 | GNUNET_CONTAINER_bloomfilter_free (bf); | 231 | GNUNET_CONTAINER_bloomfilter_free (bf); |
225 | GNUNET_CONTAINER_bloomfilter_free (bfi); | 232 | GNUNET_CONTAINER_bloomfilter_free (bfi); |
226 | return -1; | 233 | return -1; |
@@ -228,7 +235,8 @@ main (int argc, char *argv[]) | |||
228 | if (ok2 != 20) | 235 | if (ok2 != 20) |
229 | { | 236 | { |
230 | printf ("Expected 20 elements in resized filter" | 237 | printf ("Expected 20 elements in resized filter" |
231 | " after adding 20, got %d\n", ok2); | 238 | " after adding 20, got %d\n", |
239 | ok2); | ||
232 | GNUNET_CONTAINER_bloomfilter_free (bf); | 240 | GNUNET_CONTAINER_bloomfilter_free (bf); |
233 | GNUNET_CONTAINER_bloomfilter_free (bfi); | 241 | GNUNET_CONTAINER_bloomfilter_free (bfi); |
234 | return -1; | 242 | return -1; |
@@ -238,6 +246,6 @@ main (int argc, char *argv[]) | |||
238 | GNUNET_CONTAINER_bloomfilter_free (bf); | 246 | GNUNET_CONTAINER_bloomfilter_free (bf); |
239 | GNUNET_CONTAINER_bloomfilter_free (bfi); | 247 | GNUNET_CONTAINER_bloomfilter_free (bfi); |
240 | 248 | ||
241 | GNUNET_break (0 == UNLINK (TESTFILE)); | 249 | GNUNET_break (0 == unlink (TESTFILE)); |
242 | return 0; | 250 | return 0; |
243 | } | 251 | } |