LRN: Fix automake deps to allow -j* builds again

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

diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index 880d4184600a95de95e5f779fe4cdd20e9fc7681..9148e73b0461fe8b0cc712b0db6d44296d3ac521 100644 (file)
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -238,8 +238,8 @@ check()
   int q;
   int i = 100;
   char txt[128];
-  char *data;
-  unsigned long long size;
+  char *str;
+  unsigned char* thumb;
 
   meta = GNUNET_CONTAINER_meta_data_create ();
   meta2 = GNUNET_CONTAINER_meta_data_create ();
@@ -263,7 +263,7 @@ check()
     }
   
   //check meta_data_test_equal
-  if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta,meta2))
+  if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta, meta2))
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);
@@ -276,23 +276,23 @@ check()
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);
     }
-  //check equal branch in meta_data_test_equal
+  // check equal branch in meta_data_test_equal
   if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta,meta))
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);
     }  
-  //check "count" branch in meta_data_test_equal
+  // check "count" branch in meta_data_test_equal
   if (GNUNET_NO != GNUNET_CONTAINER_meta_data_test_equal(meta,meta2))
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);
     }   
 
-  //check meta_data_add_publication_date
+  // check meta_data_add_publication_date
   GNUNET_CONTAINER_meta_data_add_publication_date(meta2);
   
-  //check meta_data_merge
+  // check meta_data_merge
   GNUNET_CONTAINER_meta_data_clear(meta2);
   GNUNET_CONTAINER_meta_data_merge(meta2,meta);
   if (100 == GNUNET_CONTAINER_meta_data_iterate(meta2,NULL,NULL))
@@ -301,52 +301,63 @@ check()
       ABORT(meta);
     }  
   
-  //check meta_data_get_by_type
+  // check meta_data_get_by_type
   GNUNET_CONTAINER_meta_data_clear(meta2);
-  if (GNUNET_CONTAINER_meta_data_get_by_type(meta2,EXTRACTOR_METATYPE_UNKNOWN) != NULL)
+  if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type (meta2, EXTRACTOR_METATYPE_UNKNOWN)))
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
+      GNUNET_free (str);
       ABORT(meta);      
     } 
   
-  char* str = GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_UNKNOWN);
+  str = GNUNET_CONTAINER_meta_data_get_by_type (meta, EXTRACTOR_METATYPE_UNKNOWN);
+  GNUNET_assert (NULL != str);
   if (str[0] != 'T')
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
+      GNUNET_free (str);
       ABORT(meta);      
     } 
-  //check branch
-  if (GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_PUBLICATION_DATE) != NULL)
+  GNUNET_free (str);
+
+  // check branch
+  if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type (meta, EXTRACTOR_METATYPE_PUBLICATION_DATE)))
     {
+      GNUNET_free (str);
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);      
     } 
 
   //check meta_data_get_first_by_types
-  str = GNUNET_CONTAINER_meta_data_get_first_by_types(meta,
-                                                     EXTRACTOR_METATYPE_UNKNOWN,
-                                                     -1);
+  str = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+                                                      EXTRACTOR_METATYPE_UNKNOWN,
+                                                      -1);
+  GNUNET_assert (NULL != str);
   if (str[0] != 'T')
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
+      GNUNET_free (str);
       ABORT(meta);      
     } 
-
+  GNUNET_free (str);
+      
   //check meta_data_get_thumbnail
-  unsigned char** thumb;
-  if (GNUNET_CONTAINER_meta_data_get_thumbnail(meta,thumb) !=0)
+  if (GNUNET_CONTAINER_meta_data_get_thumbnail(meta, &thumb) != 0)
     {
+      GNUNET_free (thumb);
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);
     }
-
+  GNUNET_CONTAINER_meta_data_destroy (meta2);
   //check meta_data_duplicate
-  GNUNET_CONTAINER_meta_data_duplicate(meta);
-  if (200 == GNUNET_CONTAINER_meta_data_iterate(meta,NULL,NULL))
+  meta2 = GNUNET_CONTAINER_meta_data_duplicate(meta);
+  if (200 == GNUNET_CONTAINER_meta_data_iterate (meta2, NULL, NULL))
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);
     }
+  GNUNET_CONTAINER_meta_data_destroy(meta2);
+  GNUNET_CONTAINER_meta_data_destroy(meta);
   return 0; 
 }