1 files changed, 207 insertions, 199 deletions
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index 3cbbc27d3..0602d8318 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -29,52 +29,52 @@
 static int
-testKeyword()
+testKeyword ()
 {
  char *uri;
  struct GNUNET_FS_Uri *ret;
  char *emsg;
-  if (NULL != (ret = GNUNET_FS_uri_parse("gnunet://fs/ksk/++", &emsg)))
+  if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/++", &emsg)))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  GNUNET_free(emsg);
+  GNUNET_free (emsg);
-  ret = GNUNET_FS_uri_parse("gnunet://fs/ksk/foo+bar", &emsg);
+  ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/foo+bar", &emsg);
  if (NULL == ret)
-    {
+  {
-      GNUNET_free(emsg);
+    GNUNET_free (emsg);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  if (!GNUNET_FS_uri_test_ksk(ret))
+  if (! GNUNET_FS_uri_test_ksk (ret))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
  if ((2 != ret->data.ksk.keywordCount) ||
-      (0 != strcmp(" foo", ret->data.ksk.keywords[0])) ||
+      (0 != strcmp (" foo", ret->data.ksk.keywords[0])) ||
-      (0 != strcmp(" bar", ret->data.ksk.keywords[1])))
+      (0 != strcmp (" bar", ret->data.ksk.keywords[1])))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  uri = GNUNET_FS_uri_to_string(ret);
+  uri = GNUNET_FS_uri_to_string (ret);
-  if (0 != strcmp(uri, "gnunet://fs/ksk/foo+bar"))
+  if (0 != strcmp (uri, "gnunet://fs/ksk/foo+bar"))
-    {
+  {
-      GNUNET_free(uri);
+    GNUNET_free (uri);
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  GNUNET_free(uri);
+  GNUNET_free (uri);
-  GNUNET_FS_uri_destroy(ret);
+  GNUNET_FS_uri_destroy (ret);
  return 0;
 }
 static int
-testLocation()
+testLocation ()
 {
  struct GNUNET_FS_Uri *uri;
  char *uric;
@@ -85,70 +85,71 @@ testLocation()
  baseURI =
    GNUNET_FS_uri_parse
-      ("gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.15999",
+    (
+      "gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.15999",
      &emsg);
-  GNUNET_assert(baseURI != NULL);
+  GNUNET_assert (baseURI != NULL);
-  GNUNET_assert(emsg == NULL);
+  GNUNET_assert (emsg == NULL);
-  pk = GNUNET_CRYPTO_eddsa_key_create();
+  pk = GNUNET_CRYPTO_eddsa_key_create ();
-  uri = GNUNET_FS_uri_loc_create(baseURI,
+  uri = GNUNET_FS_uri_loc_create (baseURI,
-                                 pk,
+                                  pk,
-                                 GNUNET_TIME_absolute_get());
+                                  GNUNET_TIME_absolute_get ());
-  GNUNET_free(pk);
+  GNUNET_free (pk);
  if (NULL == uri)
-    {
+  {
-      GNUNET_break(0);
+    GNUNET_break (0);
-      GNUNET_FS_uri_destroy(baseURI);
+    GNUNET_FS_uri_destroy (baseURI);
-      return 1;
+    return 1;
-    }
+  }
-  if (!GNUNET_FS_uri_test_loc(uri))
+  if (! GNUNET_FS_uri_test_loc (uri))
-    {
+  {
-      GNUNET_break(0);
+    GNUNET_break (0);
-      GNUNET_FS_uri_destroy(uri);
+    GNUNET_FS_uri_destroy (uri);
-      GNUNET_FS_uri_destroy(baseURI);
+    GNUNET_FS_uri_destroy (baseURI);
-      return 1;
+    return 1;
-    }
+  }
-  uri2 = GNUNET_FS_uri_loc_get_uri(uri);
+  uri2 = GNUNET_FS_uri_loc_get_uri (uri);
-  if (!GNUNET_FS_uri_test_equal(baseURI, uri2))
+  if (! GNUNET_FS_uri_test_equal (baseURI, uri2))
-    {
+  {
-      GNUNET_break(0);
+    GNUNET_break (0);
-      GNUNET_FS_uri_destroy(uri);
+    GNUNET_FS_uri_destroy (uri);
-      GNUNET_FS_uri_destroy(uri2);
+    GNUNET_FS_uri_destroy (uri2);
-      GNUNET_FS_uri_destroy(baseURI);
+    GNUNET_FS_uri_destroy (baseURI);
-      return 1;
+    return 1;
-    }
+  }
-  GNUNET_FS_uri_destroy(uri2);
+  GNUNET_FS_uri_destroy (uri2);
-  GNUNET_FS_uri_destroy(baseURI);
+  GNUNET_FS_uri_destroy (baseURI);
-  uric = GNUNET_FS_uri_to_string(uri);
+  uric = GNUNET_FS_uri_to_string (uri);
 #if 0
  /* not for the faint of heart: */
-  printf("URI: `%s'\n", uric);
+  printf ("URI: `%s'\n", uric);
 #endif
-  uri2 = GNUNET_FS_uri_parse(uric, &emsg);
+  uri2 = GNUNET_FS_uri_parse (uric, &emsg);
-  GNUNET_free(uric);
+  GNUNET_free (uric);
  if (uri2 == NULL)
-    {
+  {
-      fprintf(stderr, "URI parsing failed: %s\n", emsg);
+    fprintf (stderr, "URI parsing failed: %s\n", emsg);
-      GNUNET_break(0);
+    GNUNET_break (0);
-      GNUNET_FS_uri_destroy(uri);
+    GNUNET_FS_uri_destroy (uri);
-      GNUNET_free(emsg);
+    GNUNET_free (emsg);
-      return 1;
+    return 1;
-    }
+  }
-  GNUNET_assert(NULL == emsg);
+  GNUNET_assert (NULL == emsg);
-  if (GNUNET_YES != GNUNET_FS_uri_test_equal(uri, uri2))
+  if (GNUNET_YES != GNUNET_FS_uri_test_equal (uri, uri2))
-    {
+  {
-      GNUNET_break(0);
+    GNUNET_break (0);
-      GNUNET_FS_uri_destroy(uri);
+    GNUNET_FS_uri_destroy (uri);
-      GNUNET_FS_uri_destroy(uri2);
+    GNUNET_FS_uri_destroy (uri2);
-      return 1;
+    return 1;
-    }
+  }
-  GNUNET_FS_uri_destroy(uri2);
+  GNUNET_FS_uri_destroy (uri2);
-  GNUNET_FS_uri_destroy(uri);
+  GNUNET_FS_uri_destroy (uri);
  return 0;
 }
 static int
-testNamespace(int i)
+testNamespace (int i)
 {
  char *uri;
  struct GNUNET_FS_Uri *ret;
@@ -161,71 +162,74 @@ testNamespace(int i)
  if (NULL !=
      (ret =
-         GNUNET_FS_uri_parse("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK",
+         GNUNET_FS_uri_parse (
-                             &emsg)))
+           "gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK",
-    {
+           &emsg)))
-      GNUNET_FS_uri_destroy(ret);
+  {
-      GNUNET_assert(0);
+    GNUNET_FS_uri_destroy (ret);
-    }
+    GNUNET_assert (0);
-  GNUNET_free(emsg);
+  }
+  GNUNET_free (emsg);
  if (NULL !=
      (ret =
         GNUNET_FS_uri_parse
-           ("gnunet://fs/sks/XQHH4R288W26EBV369F6RCE0PJVJTX2Y74Q2FJPMPGA31HJX2JG/this", &emsg)))
+         (
-    {
+           "gnunet://fs/sks/XQHH4R288W26EBV369F6RCE0PJVJTX2Y74Q2FJPMPGA31HJX2JG/this",
-      GNUNET_FS_uri_destroy(ret);
+           &emsg)))
-      GNUNET_assert(0);
+  {
-    }
+    GNUNET_FS_uri_destroy (ret);
-  GNUNET_free(emsg);
+    GNUNET_assert (0);
-  if (NULL != (ret = GNUNET_FS_uri_parse("gnunet://fs/sks/test", &emsg)))
+  }
-    {
+  GNUNET_free (emsg);
-      GNUNET_FS_uri_destroy(ret);
+  if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/sks/test", &emsg)))
-      GNUNET_assert(0);
+  {
-    }
+    GNUNET_FS_uri_destroy (ret);
-  GNUNET_free(emsg);
+    GNUNET_assert (0);
-  ph = GNUNET_CRYPTO_ecdsa_key_create();
+  }
-  GNUNET_CRYPTO_ecdsa_key_get_public(ph, &id);
+  GNUNET_free (emsg);
-  sret = GNUNET_STRINGS_data_to_string(&id, sizeof(id),
+  ph = GNUNET_CRYPTO_ecdsa_key_create ();
-                                       ubuf, sizeof(ubuf) - 1);
+  GNUNET_CRYPTO_ecdsa_key_get_public (ph, &id);
-  GNUNET_assert(NULL != sret);
+  sret = GNUNET_STRINGS_data_to_string (&id, sizeof(id),
+                                        ubuf, sizeof(ubuf) - 1);
+  GNUNET_assert (NULL != sret);
  sret[0] = '\0';
-  GNUNET_snprintf(buf, sizeof(buf),
+  GNUNET_snprintf (buf, sizeof(buf),
-                  "gnunet://fs/sks/%s/test",
+                   "gnunet://fs/sks/%s/test",
-                  ubuf);
+                   ubuf);
-  ret = GNUNET_FS_uri_parse(buf, &emsg);
+  ret = GNUNET_FS_uri_parse (buf, &emsg);
  if (NULL == ret)
-    {
+  {
-      GNUNET_free(emsg);
+    GNUNET_free (emsg);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  if (GNUNET_FS_uri_test_ksk(ret))
+  if (GNUNET_FS_uri_test_ksk (ret))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  if (!GNUNET_FS_uri_test_sks(ret))
+  if (! GNUNET_FS_uri_test_sks (ret))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  uri = GNUNET_FS_uri_to_string(ret);
+  uri = GNUNET_FS_uri_to_string (ret);
  if (0 !=
-      strcmp(uri,
+      strcmp (uri,
-             buf))
+              buf))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_free(uri);
+    GNUNET_free (uri);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  GNUNET_free(uri);
+  GNUNET_free (uri);
-  GNUNET_FS_uri_destroy(ret);
+  GNUNET_FS_uri_destroy (ret);
  return 0;
 }
 static int
-testFile(int i)
+testFile (int i)
 {
  char *uri;
  struct GNUNET_FS_Uri *ret;
@@ -234,92 +238,96 @@ testFile(int i)
  if (NULL !=
      (ret =
         GNUNET_FS_uri_parse
-           ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42",
+         (
+           "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42",
           &emsg)))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  GNUNET_free(emsg);
+  GNUNET_free (emsg);
  if (NULL !=
      (ret =
         GNUNET_FS_uri_parse
-           ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000",
+         (
+           "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000",
           &emsg)))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  GNUNET_free(emsg);
+  GNUNET_free (emsg);
  if (NULL !=
      (ret =
         GNUNET_FS_uri_parse
-           ("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH",
+         (
+           "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH",
           &emsg)))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  GNUNET_free(emsg);
+  GNUNET_free (emsg);
  ret =
    GNUNET_FS_uri_parse
-      ("gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42",
+    (
+      "gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42",
      &emsg);
  if (ret == NULL)
-    {
+  {
-      GNUNET_free(emsg);
+    GNUNET_free (emsg);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  if (GNUNET_FS_uri_test_ksk(ret))
+  if (GNUNET_FS_uri_test_ksk (ret))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  if (GNUNET_FS_uri_test_sks(ret))
+  if (GNUNET_FS_uri_test_sks (ret))
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  if (GNUNET_ntohll(ret->data.chk.file_length) != 42)
+  if (GNUNET_ntohll (ret->data.chk.file_length) != 42)
-    {
+  {
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  uri = GNUNET_FS_uri_to_string(ret);
+  uri = GNUNET_FS_uri_to_string (ret);
  if (0 !=
-      strcmp(uri,
+      strcmp (uri,
-             "gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42"))
+              "gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42"))
-    {
+  {
-      GNUNET_free(uri);
+    GNUNET_free (uri);
-      GNUNET_FS_uri_destroy(ret);
+    GNUNET_FS_uri_destroy (ret);
-      GNUNET_assert(0);
+    GNUNET_assert (0);
-    }
+  }
-  GNUNET_free(uri);
+  GNUNET_free (uri);
-  GNUNET_FS_uri_destroy(ret);
+  GNUNET_FS_uri_destroy (ret);
  return 0;
 }
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
  int failureCount = 0;
  int i;
-  GNUNET_log_setup("test_fs_uri",
+  GNUNET_log_setup ("test_fs_uri",
-                   "WARNING",
+                    "WARNING",
-                   NULL);
+                    NULL);
-  failureCount += testKeyword();
+  failureCount += testKeyword ();
-  failureCount += testLocation();
+  failureCount += testLocation ();
  for (i = 0; i < 255; i++)
-    {
+  {
-      /* fprintf (stderr, "%s",  "."); */
+    /* fprintf (stderr, "%s",  "."); */
-      failureCount += testNamespace(i);
+    failureCount += testNamespace (i);
-      failureCount += testFile(i);
+    failureCount += testFile (i);
-    }
+  }
  /* fprintf (stderr, "%s",  "\n"); */
-  GNUNET_DISK_directory_remove("/tmp/gnunet-test-fs-uri");
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
  if (failureCount != 0)
    return 1;
  return 0;

diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c index 3cbbc27d3..0602d8318 100644 --- a/src/fs/test_fs_uri.c +++ b/src/fs/test_fs_uri.c
@@ -29,52 +29,52 @@
29		29
30		30
31	static int	31	static int
32	testKeyword()	32	testKeyword ()
33	{	33	{
34	char *uri;	34	char *uri;
35	struct GNUNET_FS_Uri *ret;	35	struct GNUNET_FS_Uri *ret;
36	char *emsg;	36	char *emsg;
37		37
38	if (NULL != (ret = GNUNET_FS_uri_parse("gnunet://fs/ksk/++", &emsg)))	38	if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/++", &emsg)))
39	{	39	{
40	GNUNET_FS_uri_destroy(ret);	40	GNUNET_FS_uri_destroy (ret);
41	GNUNET_assert(0);	41	GNUNET_assert (0);
42	}	42	}
43	GNUNET_free(emsg);	43	GNUNET_free (emsg);
44	ret = GNUNET_FS_uri_parse("gnunet://fs/ksk/foo+bar", &emsg);	44	ret = GNUNET_FS_uri_parse ("gnunet://fs/ksk/foo+bar", &emsg);
45	if (NULL == ret)	45	if (NULL == ret)
46	{	46	{
47	GNUNET_free(emsg);	47	GNUNET_free (emsg);
48	GNUNET_assert(0);	48	GNUNET_assert (0);
49	}	49	}
50	if (!GNUNET_FS_uri_test_ksk(ret))	50	if (! GNUNET_FS_uri_test_ksk (ret))
51	{	51	{
52	GNUNET_FS_uri_destroy(ret);	52	GNUNET_FS_uri_destroy (ret);
53	GNUNET_assert(0);	53	GNUNET_assert (0);
54	}	54	}
55	if ((2 != ret->data.ksk.keywordCount) \|\|	55	if ((2 != ret->data.ksk.keywordCount) \|\|
56	(0 != strcmp(" foo", ret->data.ksk.keywords[0])) \|\|	56	(0 != strcmp (" foo", ret->data.ksk.keywords[0])) \|\|
57	(0 != strcmp(" bar", ret->data.ksk.keywords[1])))	57	(0 != strcmp (" bar", ret->data.ksk.keywords[1])))
58	{	58	{
59	GNUNET_FS_uri_destroy(ret);	59	GNUNET_FS_uri_destroy (ret);
60	GNUNET_assert(0);	60	GNUNET_assert (0);
61	}	61	}
62		62
63	uri = GNUNET_FS_uri_to_string(ret);	63	uri = GNUNET_FS_uri_to_string (ret);
64	if (0 != strcmp(uri, "gnunet://fs/ksk/foo+bar"))	64	if (0 != strcmp (uri, "gnunet://fs/ksk/foo+bar"))
65	{	65	{
66	GNUNET_free(uri);	66	GNUNET_free (uri);
67	GNUNET_FS_uri_destroy(ret);	67	GNUNET_FS_uri_destroy (ret);
68	GNUNET_assert(0);	68	GNUNET_assert (0);
69	}	69	}
70	GNUNET_free(uri);	70	GNUNET_free (uri);
71	GNUNET_FS_uri_destroy(ret);	71	GNUNET_FS_uri_destroy (ret);
72	return 0;	72	return 0;
73	}	73	}
74		74
75		75
76	static int	76	static int
77	testLocation()	77	testLocation ()
78	{	78	{
79	struct GNUNET_FS_Uri *uri;	79	struct GNUNET_FS_Uri *uri;
80	char *uric;	80	char *uric;
@@ -85,70 +85,71 @@ testLocation()
85		85
86	baseURI =	86	baseURI =
87	GNUNET_FS_uri_parse	87	GNUNET_FS_uri_parse
88	("gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.15999",	88	(
		89	"gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.15999",
89	&emsg);	90	&emsg);
90	GNUNET_assert(baseURI != NULL);	91	GNUNET_assert (baseURI != NULL);
91	GNUNET_assert(emsg == NULL);	92	GNUNET_assert (emsg == NULL);
92	pk = GNUNET_CRYPTO_eddsa_key_create();	93	pk = GNUNET_CRYPTO_eddsa_key_create ();
93	uri = GNUNET_FS_uri_loc_create(baseURI,	94	uri = GNUNET_FS_uri_loc_create (baseURI,
94	pk,	95	pk,
95	GNUNET_TIME_absolute_get());	96	GNUNET_TIME_absolute_get ());
96	GNUNET_free(pk);	97	GNUNET_free (pk);
97	if (NULL == uri)	98	if (NULL == uri)
98	{	99	{
99	GNUNET_break(0);	100	GNUNET_break (0);
100	GNUNET_FS_uri_destroy(baseURI);	101	GNUNET_FS_uri_destroy (baseURI);
101	return 1;	102	return 1;
102	}	103	}
103	if (!GNUNET_FS_uri_test_loc(uri))	104	if (! GNUNET_FS_uri_test_loc (uri))
104	{	105	{
105	GNUNET_break(0);	106	GNUNET_break (0);
106	GNUNET_FS_uri_destroy(uri);	107	GNUNET_FS_uri_destroy (uri);
107	GNUNET_FS_uri_destroy(baseURI);	108	GNUNET_FS_uri_destroy (baseURI);
108	return 1;	109	return 1;
109	}	110	}
110	uri2 = GNUNET_FS_uri_loc_get_uri(uri);	111	uri2 = GNUNET_FS_uri_loc_get_uri (uri);
111	if (!GNUNET_FS_uri_test_equal(baseURI, uri2))	112	if (! GNUNET_FS_uri_test_equal (baseURI, uri2))
112	{	113	{
113	GNUNET_break(0);	114	GNUNET_break (0);
114	GNUNET_FS_uri_destroy(uri);	115	GNUNET_FS_uri_destroy (uri);
115	GNUNET_FS_uri_destroy(uri2);	116	GNUNET_FS_uri_destroy (uri2);
116	GNUNET_FS_uri_destroy(baseURI);	117	GNUNET_FS_uri_destroy (baseURI);
117	return 1;	118	return 1;
118	}	119	}
119	GNUNET_FS_uri_destroy(uri2);	120	GNUNET_FS_uri_destroy (uri2);
120	GNUNET_FS_uri_destroy(baseURI);	121	GNUNET_FS_uri_destroy (baseURI);
121	uric = GNUNET_FS_uri_to_string(uri);	122	uric = GNUNET_FS_uri_to_string (uri);
122	#if 0	123	#if 0
123	/* not for the faint of heart: */	124	/* not for the faint of heart: */
124	printf("URI: `%s'\n", uric);	125	printf ("URI: `%s'\n", uric);
125	#endif	126	#endif
126	uri2 = GNUNET_FS_uri_parse(uric, &emsg);	127	uri2 = GNUNET_FS_uri_parse (uric, &emsg);
127	GNUNET_free(uric);	128	GNUNET_free (uric);
128	if (uri2 == NULL)	129	if (uri2 == NULL)
129	{	130	{
130	fprintf(stderr, "URI parsing failed: %s\n", emsg);	131	fprintf (stderr, "URI parsing failed: %s\n", emsg);
131	GNUNET_break(0);	132	GNUNET_break (0);
132	GNUNET_FS_uri_destroy(uri);	133	GNUNET_FS_uri_destroy (uri);
133	GNUNET_free(emsg);	134	GNUNET_free (emsg);
134	return 1;	135	return 1;
135	}	136	}
136	GNUNET_assert(NULL == emsg);	137	GNUNET_assert (NULL == emsg);
137	if (GNUNET_YES != GNUNET_FS_uri_test_equal(uri, uri2))	138	if (GNUNET_YES != GNUNET_FS_uri_test_equal (uri, uri2))
138	{	139	{
139	GNUNET_break(0);	140	GNUNET_break (0);
140	GNUNET_FS_uri_destroy(uri);	141	GNUNET_FS_uri_destroy (uri);
141	GNUNET_FS_uri_destroy(uri2);	142	GNUNET_FS_uri_destroy (uri2);
142	return 1;	143	return 1;
143	}	144	}
144	GNUNET_FS_uri_destroy(uri2);	145	GNUNET_FS_uri_destroy (uri2);
145	GNUNET_FS_uri_destroy(uri);	146	GNUNET_FS_uri_destroy (uri);
146	return 0;	147	return 0;
147	}	148	}
148		149
149		150
150	static int	151	static int
151	testNamespace(int i)	152	testNamespace (int i)
152	{	153	{
153	char *uri;	154	char *uri;
154	struct GNUNET_FS_Uri *ret;	155	struct GNUNET_FS_Uri *ret;
@@ -161,71 +162,74 @@ testNamespace(int i)
161		162
162	if (NULL !=	163	if (NULL !=
163	(ret =	164	(ret =
164	GNUNET_FS_uri_parse("gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK",	165	GNUNET_FS_uri_parse (
165	&emsg)))	166	"gnunet://fs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK",
166	{	167	&emsg)))
167	GNUNET_FS_uri_destroy(ret);	168	{
168	GNUNET_assert(0);	169	GNUNET_FS_uri_destroy (ret);
169	}	170	GNUNET_assert (0);
170	GNUNET_free(emsg);	171	}
		172	GNUNET_free (emsg);
171	if (NULL !=	173	if (NULL !=
172	(ret =	174	(ret =
173	GNUNET_FS_uri_parse	175	GNUNET_FS_uri_parse
174	("gnunet://fs/sks/XQHH4R288W26EBV369F6RCE0PJVJTX2Y74Q2FJPMPGA31HJX2JG/this", &emsg)))	176	(
175	{	177	"gnunet://fs/sks/XQHH4R288W26EBV369F6RCE0PJVJTX2Y74Q2FJPMPGA31HJX2JG/this",
176	GNUNET_FS_uri_destroy(ret);	178	&emsg)))
177	GNUNET_assert(0);	179	{
178	}	180	GNUNET_FS_uri_destroy (ret);
179	GNUNET_free(emsg);	181	GNUNET_assert (0);
180	if (NULL != (ret = GNUNET_FS_uri_parse("gnunet://fs/sks/test", &emsg)))	182	}
181	{	183	GNUNET_free (emsg);
182	GNUNET_FS_uri_destroy(ret);	184	if (NULL != (ret = GNUNET_FS_uri_parse ("gnunet://fs/sks/test", &emsg)))
183	GNUNET_assert(0);	185	{
184	}	186	GNUNET_FS_uri_destroy (ret);
185	GNUNET_free(emsg);	187	GNUNET_assert (0);
186	ph = GNUNET_CRYPTO_ecdsa_key_create();	188	}
187	GNUNET_CRYPTO_ecdsa_key_get_public(ph, &id);	189	GNUNET_free (emsg);
188	sret = GNUNET_STRINGS_data_to_string(&id, sizeof(id),	190	ph = GNUNET_CRYPTO_ecdsa_key_create ();
189	ubuf, sizeof(ubuf) - 1);	191	GNUNET_CRYPTO_ecdsa_key_get_public (ph, &id);
190	GNUNET_assert(NULL != sret);	192	sret = GNUNET_STRINGS_data_to_string (&id, sizeof(id),
		193	ubuf, sizeof(ubuf) - 1);
		194	GNUNET_assert (NULL != sret);
191	sret[0] = '\0';	195	sret[0] = '\0';
192	GNUNET_snprintf(buf, sizeof(buf),	196	GNUNET_snprintf (buf, sizeof(buf),
193	"gnunet://fs/sks/%s/test",	197	"gnunet://fs/sks/%s/test",
194	ubuf);	198	ubuf);
195	ret = GNUNET_FS_uri_parse(buf, &emsg);	199	ret = GNUNET_FS_uri_parse (buf, &emsg);
196	if (NULL == ret)	200	if (NULL == ret)
197	{	201	{
198	GNUNET_free(emsg);	202	GNUNET_free (emsg);
199	GNUNET_assert(0);	203	GNUNET_assert (0);
200	}	204	}
201	if (GNUNET_FS_uri_test_ksk(ret))	205	if (GNUNET_FS_uri_test_ksk (ret))
202	{	206	{
203	GNUNET_FS_uri_destroy(ret);	207	GNUNET_FS_uri_destroy (ret);
204	GNUNET_assert(0);	208	GNUNET_assert (0);
205	}	209	}
206	if (!GNUNET_FS_uri_test_sks(ret))	210	if (! GNUNET_FS_uri_test_sks (ret))
207	{	211	{
208	GNUNET_FS_uri_destroy(ret);	212	GNUNET_FS_uri_destroy (ret);
209	GNUNET_assert(0);	213	GNUNET_assert (0);
210	}	214	}
211		215
212	uri = GNUNET_FS_uri_to_string(ret);	216	uri = GNUNET_FS_uri_to_string (ret);
213	if (0 !=	217	if (0 !=
214	strcmp(uri,	218	strcmp (uri,
215	buf))	219	buf))
216	{	220	{
217	GNUNET_FS_uri_destroy(ret);	221	GNUNET_FS_uri_destroy (ret);
218	GNUNET_free(uri);	222	GNUNET_free (uri);
219	GNUNET_assert(0);	223	GNUNET_assert (0);
220	}	224	}
221	GNUNET_free(uri);	225	GNUNET_free (uri);
222	GNUNET_FS_uri_destroy(ret);	226	GNUNET_FS_uri_destroy (ret);
223	return 0;	227	return 0;
224	}	228	}
225		229
226		230
227	static int	231	static int
228	testFile(int i)	232	testFile (int i)
229	{	233	{
230	char *uri;	234	char *uri;
231	struct GNUNET_FS_Uri *ret;	235	struct GNUNET_FS_Uri *ret;
@@ -234,92 +238,96 @@ testFile(int i)
234	if (NULL !=	238	if (NULL !=
235	(ret =	239	(ret =
236	GNUNET_FS_uri_parse	240	GNUNET_FS_uri_parse
237	("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42",	241	(
		242	"gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42",
238	&emsg)))	243	&emsg)))
239	{	244	{
240	GNUNET_FS_uri_destroy(ret);	245	GNUNET_FS_uri_destroy (ret);
241	GNUNET_assert(0);	246	GNUNET_assert (0);
242	}	247	}
243	GNUNET_free(emsg);	248	GNUNET_free (emsg);
244	if (NULL !=	249	if (NULL !=
245	(ret =	250	(ret =
246	GNUNET_FS_uri_parse	251	GNUNET_FS_uri_parse
247	("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000",	252	(
		253	"gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000",
248	&emsg)))	254	&emsg)))
249	{	255	{
250	GNUNET_FS_uri_destroy(ret);	256	GNUNET_FS_uri_destroy (ret);
251	GNUNET_assert(0);	257	GNUNET_assert (0);
252	}	258	}
253	GNUNET_free(emsg);	259	GNUNET_free (emsg);
254	if (NULL !=	260	if (NULL !=
255	(ret =	261	(ret =
256	GNUNET_FS_uri_parse	262	GNUNET_FS_uri_parse
257	("gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH",	263	(
		264	"gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH",
258	&emsg)))	265	&emsg)))
259	{	266	{
260	GNUNET_FS_uri_destroy(ret);	267	GNUNET_FS_uri_destroy (ret);
261	GNUNET_assert(0);	268	GNUNET_assert (0);
262	}	269	}
263	GNUNET_free(emsg);	270	GNUNET_free (emsg);
264	ret =	271	ret =
265	GNUNET_FS_uri_parse	272	GNUNET_FS_uri_parse
266	("gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42",	273	(
		274	"gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42",
267	&emsg);	275	&emsg);
268	if (ret == NULL)	276	if (ret == NULL)
269	{	277	{
270	GNUNET_free(emsg);	278	GNUNET_free (emsg);
271	GNUNET_assert(0);	279	GNUNET_assert (0);
272	}	280	}
273	if (GNUNET_FS_uri_test_ksk(ret))	281	if (GNUNET_FS_uri_test_ksk (ret))
274	{	282	{
275	GNUNET_FS_uri_destroy(ret);	283	GNUNET_FS_uri_destroy (ret);
276	GNUNET_assert(0);	284	GNUNET_assert (0);
277	}	285	}
278	if (GNUNET_FS_uri_test_sks(ret))	286	if (GNUNET_FS_uri_test_sks (ret))
279	{	287	{
280	GNUNET_FS_uri_destroy(ret);	288	GNUNET_FS_uri_destroy (ret);
281	GNUNET_assert(0);	289	GNUNET_assert (0);
282	}	290	}
283	if (GNUNET_ntohll(ret->data.chk.file_length) != 42)	291	if (GNUNET_ntohll (ret->data.chk.file_length) != 42)
284	{	292	{
285	GNUNET_FS_uri_destroy(ret);	293	GNUNET_FS_uri_destroy (ret);
286	GNUNET_assert(0);	294	GNUNET_assert (0);
287	}	295	}
288		296
289	uri = GNUNET_FS_uri_to_string(ret);	297	uri = GNUNET_FS_uri_to_string (ret);
290	if (0 !=	298	if (0 !=
291	strcmp(uri,	299	strcmp (uri,
292	"gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42"))	300	"gnunet://fs/chk/4QZP479A9SKGFNMQ2ZBCYE71YV2QMTVGWTVPB6A10ASVCKXDHB05DKPSC7ZF6E9P9W1VE47394EQY7NXA47Q6R35M7P1MJPGP59D1Z8.D54QD1K5XCG5878T6YZ19AM60MQ6FC0YNVK7QY08KK0KM0FJJ3KQWYG112FN5T07KN7J0X35DF6WVBT9B8ZMZ3X2BXJ22X3KFQ6MV2G.42"))
293	{	301	{
294	GNUNET_free(uri);	302	GNUNET_free (uri);
295	GNUNET_FS_uri_destroy(ret);	303	GNUNET_FS_uri_destroy (ret);
296	GNUNET_assert(0);	304	GNUNET_assert (0);
297	}	305	}
298	GNUNET_free(uri);	306	GNUNET_free (uri);
299	GNUNET_FS_uri_destroy(ret);	307	GNUNET_FS_uri_destroy (ret);
300	return 0;	308	return 0;
301	}	309	}
302		310
303		311
304	int	312	int
305	main(int argc, char *argv[])	313	main (int argc, char *argv[])
306	{	314	{
307	int failureCount = 0;	315	int failureCount = 0;
308	int i;	316	int i;
309		317
310	GNUNET_log_setup("test_fs_uri",	318	GNUNET_log_setup ("test_fs_uri",
311	"WARNING",	319	"WARNING",
312	NULL);	320	NULL);
313	failureCount += testKeyword();	321	failureCount += testKeyword ();
314	failureCount += testLocation();	322	failureCount += testLocation ();
315	for (i = 0; i < 255; i++)	323	for (i = 0; i < 255; i++)
316	{	324	{
317	/* fprintf (stderr, "%s", "."); */	325	/* fprintf (stderr, "%s", "."); */
318	failureCount += testNamespace(i);	326	failureCount += testNamespace (i);
319	failureCount += testFile(i);	327	failureCount += testFile (i);
320	}	328	}
321	/* fprintf (stderr, "%s", "\n"); */	329	/* fprintf (stderr, "%s", "\n"); */
322	GNUNET_DISK_directory_remove("/tmp/gnunet-test-fs-uri");	330	GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
323	if (failureCount != 0)	331	if (failureCount != 0)
324	return 1;	332	return 1;
325	return 0;	333	return 0;