aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-03-28 07:03:15 +0000
committerChristian Grothoff <christian@grothoff.org>2011-03-28 07:03:15 +0000
commit82c7945fd89a2d9a636aae5050cee2249629d7d6 (patch)
tree3909003e9fd62d161678cdccf04d25930d172499 /src/util
parent5115715f1a331ec47a3bdc1d0778f72bae5a2a11 (diff)
downloadgnunet-82c7945fd89a2d9a636aae5050cee2249629d7d6.tar.gz
gnunet-82c7945fd89a2d9a636aae5050cee2249629d7d6.zip
fix
Diffstat (limited to 'src/util')
-rw-r--r--src/util/test_container_meta_data.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index ce85091ac..b4509ceb3 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -263,7 +263,7 @@ check()
263 } 263 }
264 264
265 //check meta_data_test_equal 265 //check meta_data_test_equal
266 if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta,meta2)) 266 if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta, meta2))
267 { 267 {
268 GNUNET_CONTAINER_meta_data_destroy(meta2); 268 GNUNET_CONTAINER_meta_data_destroy(meta2);
269 ABORT(meta); 269 ABORT(meta);
@@ -276,23 +276,23 @@ check()
276 GNUNET_CONTAINER_meta_data_destroy(meta2); 276 GNUNET_CONTAINER_meta_data_destroy(meta2);
277 ABORT(meta); 277 ABORT(meta);
278 } 278 }
279 //check equal branch in meta_data_test_equal 279 // check equal branch in meta_data_test_equal
280 if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta,meta)) 280 if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta,meta))
281 { 281 {
282 GNUNET_CONTAINER_meta_data_destroy(meta2); 282 GNUNET_CONTAINER_meta_data_destroy(meta2);
283 ABORT(meta); 283 ABORT(meta);
284 } 284 }
285 //check "count" branch in meta_data_test_equal 285 // check "count" branch in meta_data_test_equal
286 if (GNUNET_NO != GNUNET_CONTAINER_meta_data_test_equal(meta,meta2)) 286 if (GNUNET_NO != GNUNET_CONTAINER_meta_data_test_equal(meta,meta2))
287 { 287 {
288 GNUNET_CONTAINER_meta_data_destroy(meta2); 288 GNUNET_CONTAINER_meta_data_destroy(meta2);
289 ABORT(meta); 289 ABORT(meta);
290 } 290 }
291 291
292 //check meta_data_add_publication_date 292 // check meta_data_add_publication_date
293 GNUNET_CONTAINER_meta_data_add_publication_date(meta2); 293 GNUNET_CONTAINER_meta_data_add_publication_date(meta2);
294 294
295 //check meta_data_merge 295 // check meta_data_merge
296 GNUNET_CONTAINER_meta_data_clear(meta2); 296 GNUNET_CONTAINER_meta_data_clear(meta2);
297 GNUNET_CONTAINER_meta_data_merge(meta2,meta); 297 GNUNET_CONTAINER_meta_data_merge(meta2,meta);
298 if (100 == GNUNET_CONTAINER_meta_data_iterate(meta2,NULL,NULL)) 298 if (100 == GNUNET_CONTAINER_meta_data_iterate(meta2,NULL,NULL))
@@ -301,16 +301,16 @@ check()
301 ABORT(meta); 301 ABORT(meta);
302 } 302 }
303 303
304 //check meta_data_get_by_type 304 // check meta_data_get_by_type
305 GNUNET_CONTAINER_meta_data_clear(meta2); 305 GNUNET_CONTAINER_meta_data_clear(meta2);
306 if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type(meta2,EXTRACTOR_METATYPE_UNKNOWN))) 306 if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type (meta2, EXTRACTOR_METATYPE_UNKNOWN)))
307 { 307 {
308 GNUNET_CONTAINER_meta_data_destroy(meta2); 308 GNUNET_CONTAINER_meta_data_destroy(meta2);
309 GNUNET_free (str); 309 GNUNET_free (str);
310 ABORT(meta); 310 ABORT(meta);
311 } 311 }
312 312
313 str = GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_UNKNOWN); 313 str = GNUNET_CONTAINER_meta_data_get_by_type (meta, EXTRACTOR_METATYPE_UNKNOWN);
314 GNUNET_assert (NULL != str); 314 GNUNET_assert (NULL != str);
315 if (str[0] != 'T') 315 if (str[0] != 'T')
316 { 316 {
@@ -318,8 +318,10 @@ check()
318 GNUNET_free (str); 318 GNUNET_free (str);
319 ABORT(meta); 319 ABORT(meta);
320 } 320 }
321 //check branch 321 GNUNET_free (str);
322 if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_PUBLICATION_DATE))) 322
323 // check branch
324 if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type (meta, EXTRACTOR_METATYPE_PUBLICATION_DATE)))
323 { 325 {
324 GNUNET_free (str); 326 GNUNET_free (str);
325 GNUNET_CONTAINER_meta_data_destroy(meta2); 327 GNUNET_CONTAINER_meta_data_destroy(meta2);
@@ -327,9 +329,9 @@ check()
327 } 329 }
328 330
329 //check meta_data_get_first_by_types 331 //check meta_data_get_first_by_types
330 str = GNUNET_CONTAINER_meta_data_get_first_by_types(meta, 332 str = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
331 EXTRACTOR_METATYPE_UNKNOWN, 333 EXTRACTOR_METATYPE_UNKNOWN,
332 -1); 334 -1);
333 GNUNET_assert (NULL != str); 335 GNUNET_assert (NULL != str);
334 if (str[0] != 'T') 336 if (str[0] != 'T')
335 { 337 {
@@ -340,7 +342,6 @@ check()
340 GNUNET_free (str); 342 GNUNET_free (str);
341 343
342 //check meta_data_get_thumbnail 344 //check meta_data_get_thumbnail
343
344 if (GNUNET_CONTAINER_meta_data_get_thumbnail(meta, &thumb) != 0) 345 if (GNUNET_CONTAINER_meta_data_get_thumbnail(meta, &thumb) != 0)
345 { 346 {
346 GNUNET_free (thumb); 347 GNUNET_free (thumb);
@@ -350,7 +351,7 @@ check()
350 351
351 //check meta_data_duplicate 352 //check meta_data_duplicate
352 GNUNET_CONTAINER_meta_data_duplicate(meta); 353 GNUNET_CONTAINER_meta_data_duplicate(meta);
353 if (200 == GNUNET_CONTAINER_meta_data_iterate(meta,NULL,NULL)) 354 if (200 == GNUNET_CONTAINER_meta_data_iterate (meta, NULL, NULL))
354 { 355 {
355 GNUNET_CONTAINER_meta_data_destroy(meta2); 356 GNUNET_CONTAINER_meta_data_destroy(meta2);
356 ABORT(meta); 357 ABORT(meta);