nitpicks
authorChristian Grothoff <christian@grothoff.org>
Fri, 3 Sep 2010 21:16:26 +0000 (21:16 +0000)
committerChristian Grothoff <christian@grothoff.org>
Fri, 3 Sep 2010 21:16:26 +0000 (21:16 +0000)
src/fs/test_fs_file_information.c
src/fs/test_fs_list_indexed.c
src/fs/test_fs_namespace.c
src/fs/test_fs_publish.c
src/fs/test_fs_publish_persistence.c
src/fs/test_fs_uri.c

index 2676330b70d094534cde194a0f90dcec53630291..57698165e460ebe06b1951a9331be803cdc47081 100644 (file)
@@ -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,
index 7523543bb7636fdfed6066da8d978bf2eb8146d3..eb5fdf50515be1575fc6ef23fae306bbc99eeb7d 100644 (file)
@@ -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,
index 74b733bbc92775ee320106e822efc1d80e2b5efd..f197b4749c0e208e705a5b567c7578eb08245efe 100644 (file)
@@ -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)
index ed0b285bc680f26011d008610dec02a8c0984c9b..45d1c822a17927c23e03528499e85a4c030b5eb9 100644 (file)
@@ -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,
index cc3450a9fecdb6b7d05fa5ce9dfa2821e587f06d..dfcf335c7619537237c617e3d57e5586ae1348e3 100644 (file)
@@ -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,
index 0131ab32f38208af3d210d07555fb5970392369e..0199ad2a983c141ca07c3edc79857ac6cf0c3783 100644 (file)
@@ -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);