nitpicks

6 files changed, 40 insertions, 11 deletions

diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index 2676330b7..57698165e 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -123,6 +123,7 @@ run (void *cls,
                                                      1,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (fi1 != NULL);
   fi2 = GNUNET_FS_file_information_create_from_file (fs,
                                                      "file_information-context2",
                                                      fn2,
@@ -132,6 +133,7 @@ run (void *cls,
                                                      1,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (fi2 != NULL);
   fidir = GNUNET_FS_file_information_create_empty_directory (fs,
                                                              "file_information-context-dir",
                                                              kuri,
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 7523543bb..eb5fdf505 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -287,6 +287,7 @@ run (void *cls,
                                                      1,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (NULL != fi1);
   fi2 = GNUNET_FS_file_information_create_from_file (fs,
                                                      "list_indexed-context2",
                                                      fn2,
@@ -296,6 +297,7 @@ run (void *cls,
                                                      2,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (NULL != fi2);
   fidir = GNUNET_FS_file_information_create_empty_directory (fs,
                                                              "list_indexed-context-dir",
                                                              kuri,
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 74b733bbc..f197b4749 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -123,6 +123,7 @@ abort_sks_search_task (void *cls,
   sks_search = NULL;
   ns = GNUNET_FS_namespace_create (fs,
                                    "testNamespace");
+  GNUNET_assert (NULL != ns);
   GNUNET_assert (GNUNET_OK == GNUNET_FS_namespace_delete (ns, GNUNET_YES));
   if (ksk_search == NULL)
     {
@@ -305,6 +306,7 @@ adv_cont (void *cls,
   expiration = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
   ns = GNUNET_FS_namespace_create (fs,
                                    "testNamespace");
+  GNUNET_assert (NULL != ns);
   meta = GNUNET_CONTAINER_meta_data_create ();
   GNUNET_assert (NULL == emsg);
   sks_expect_uri = GNUNET_FS_uri_dup (uri);
@@ -350,6 +352,7 @@ testNamespace ()
 
   ns = GNUNET_FS_namespace_create (fs,
                                    "testNamespace");
+  GNUNET_assert (NULL != ns);
   ok = GNUNET_NO;
   GNUNET_FS_namespace_list (fs, &ns_iterator, &ok);
   if (GNUNET_NO == ok)
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index ed0b285bc..45d1c822a 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -272,6 +272,7 @@ run (void *cls,
                                                      1,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (NULL != fi1);
   fi2 = GNUNET_FS_file_information_create_from_file (fs,
                                                      "publish-context2",
                                                      fn2,
@@ -281,6 +282,7 @@ run (void *cls,
                                                      2,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (NULL != fi2);
   fidir = GNUNET_FS_file_information_create_empty_directory (fs,
                                                              "publish-context-dir",
                                                              kuri,
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index cc3450a9f..dfcf335c7 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -332,6 +332,7 @@ run (void *cls,
                                                      1,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (NULL != fi1);
   fi2 = GNUNET_FS_file_information_create_from_file (fs,
                                                      "publish-context2",
                                                      fn2,
@@ -341,6 +342,7 @@ run (void *cls,
                                                      2,
                                                      42,
                                                      GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+  GNUNET_assert (NULL != fi2);
   fidir = GNUNET_FS_file_information_create_empty_directory (fs,
                                                              "publish-context-dir",
                                                              kuri,
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index 0131ab32f..0199ad2a9 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -163,15 +163,24 @@ testNamespace (int i)
   char *emsg;
 
   if (NULL !=
-      GNUNET_FS_uri_parse ("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK", &emsg))
-    ABORT ();
+      (ret = GNUNET_FS_uri_parse ("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK", &emsg)))
+    {
+      GNUNET_FS_uri_destroy (ret);
+      ABORT ();
+    }
   GNUNET_free (emsg);
   if (NULL !=
-      GNUNET_FS_uri_parse ("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3V/test", &emsg))    
+      (ret = GNUNET_FS_uri_parse ("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3V/test", &emsg)))
+    {
+      GNUNET_FS_uri_destroy (ret);
       ABORT ();    
+    }
   GNUNET_free (emsg);
-  if (NULL != GNUNET_FS_uri_parse ("gnunet://fs/sks/test", &emsg))
-    ABORT ();
+  if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/sks/test", &emsg)))
+    {
+      GNUNET_FS_uri_destroy (ret);
+      ABORT ();
+    }
   GNUNET_free (emsg);
   ret =
     GNUNET_FS_uri_parse ("gnunet://fs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test", &emsg);
@@ -212,16 +221,25 @@ testFile (int i)
   char *emsg;
 
   if (NULL !=
-      GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42", &emsg))
-    ABORT ();
+      (ret = GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42", &emsg)))
+    {
+      GNUNET_FS_uri_destroy (ret);
+      ABORT ();
+    }
   GNUNET_free (emsg);
   if (NULL !=
-      GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000", &emsg))
-    ABORT ();
+      (ret = GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000", &emsg)))
+    {
+      GNUNET_FS_uri_destroy (ret);
+      ABORT ();
+    }
   GNUNET_free (emsg);
   if (NULL !=
-      GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH", &emsg))
-    ABORT ();
+      (ret = GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH", &emsg)))
+    {
+      GNUNET_FS_uri_destroy (ret);
+      ABORT ();
+    }
   GNUNET_free (emsg);
   ret =
     GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42", &emsg);