arg

[oweals/gnunet.git] / src / fs / test_fs_uri.c

diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index ee587c92ac846267e4b40a49b5d136db0f8d01b3..0894b8b9386fbb06821c9fa18cf1c183c1ed7690 100644 (file)
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -38,12 +38,18 @@ testKeyword ()
   struct GNUNET_FS_Uri *ret;
   char *emsg;
 
-  if (NULL != GNUNET_FS_uri_parse ("gnunet://fs/ksk/++", &emsg))
-    ABORT ();
+  if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/++", &emsg)))
+    {
+      GNUNET_FS_uri_destroy (ret);
+      ABORT ();
+    }
   GNUNET_free (emsg);
   ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/foo+bar", &emsg);
   if (ret == NULL)
-    ABORT ();
+    {
+      GNUNET_free (emsg);
+      ABORT ();
+    }
   if (!GNUNET_FS_uri_test_ksk (ret))
     {
       GNUNET_FS_uri_destroy (ret);
@@ -82,11 +88,13 @@ testLocation ()
   baseURI =
     GNUNET_FS_uri_parse ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42", &emsg);
   GNUNET_assert (baseURI != NULL);
+  GNUNET_assert (emsg == NULL);
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_parse (cfg, "test_fs_uri_data.conf"))
     {
       fprintf (stderr, "Failed to parse configuration file\n");
+      GNUNET_FS_uri_destroy (baseURI);
       GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
@@ -132,8 +140,10 @@ testLocation ()
       GNUNET_break (0);
       GNUNET_FS_uri_destroy (uri);
       GNUNET_CONFIGURATION_destroy (cfg);
+      GNUNET_free (emsg);
       return 1;
     }
+  GNUNET_assert (NULL == emsg);
   if (GNUNET_YES != GNUNET_FS_uri_test_equal (uri, uri2))
     {
       GNUNET_break (0);
@@ -156,20 +166,32 @@ 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))
-    ABORT ();
+      (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);
   if (ret == NULL)
-    ABORT ();
+    {
+      GNUNET_free (emsg);
+      ABORT ();
+    }
   if (GNUNET_FS_uri_test_ksk (ret))
     {
       GNUNET_FS_uri_destroy (ret);
@@ -202,21 +224,33 @@ 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);
   if (ret == NULL)
-    ABORT ();
+    {
+      GNUNET_free (emsg);
+      ABORT ();
+    }
   if (GNUNET_FS_uri_test_ksk (ret))
     {
       GNUNET_FS_uri_destroy (ret);
@@ -269,6 +303,7 @@ main (int argc, char *argv[])
       failureCount += testFile (i);
     }
   /* fprintf (stderr, "\n"); */
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
   if (failureCount != 0)
     return 1;
   return 0;