-fix

[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 e8f6ed70f72327d7401606ea4627970d89de982f..b7a58ec0f38a08c7a7a7b504646d10d59c8e18ef 100644 (file)
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
-#include "fs.h"
+#include "fs_api.h"
 
 #define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); return 1; }
 
@@ -92,9 +92,9 @@ testLocation ()
   GNUNET_assert (baseURI != NULL);
   GNUNET_assert (emsg == NULL);
   cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, "test_fs_uri_data.conf"))
+  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, "test_fs_uri_data.conf"))
   {
-    fprintf (stderr, "Failed to parse configuration file\n");
+    FPRINTF (stderr, "%s",  "Failed to parse configuration file\n");
     GNUNET_FS_uri_destroy (baseURI);
     GNUNET_CONFIGURATION_destroy (cfg);
     return 1;
@@ -209,8 +209,9 @@ testNamespace (int i)
   }
 
   uri = GNUNET_FS_uri_to_string (ret);
-  if (0 != strcmp (uri,
-                   "gnunet://fs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test"))
+  if (0 !=
+      strcmp (uri,
+              "gnunet://fs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test"))
   {
     GNUNET_FS_uri_destroy (ret);
     GNUNET_free (uri);
@@ -284,8 +285,9 @@ testFile (int i)
   }
 
   uri = GNUNET_FS_uri_to_string (ret);
-  if (0 != strcmp (uri,
-                   "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42"))
+  if (0 !=
+      strcmp (uri,
+              "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42"))
   {
     GNUNET_free (uri);
     GNUNET_FS_uri_destroy (ret);
@@ -314,11 +316,11 @@ main (int argc, char *argv[])
   failureCount += testLocation ();
   for (i = 0; i < 255; i++)
   {
-    /* fprintf (stderr, "."); */
+    /* FPRINTF (stderr, "%s",  "."); */
     failureCount += testNamespace (i);
     failureCount += testFile (i);
   }
-  /* fprintf (stderr, "\n"); */
+  /* FPRINTF (stderr, "%s",  "\n"); */
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
   if (failureCount != 0)
     return 1;