1 files changed, 166 insertions, 165 deletions

diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index cacbe8be0..7ed61c332 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -30,51 +30,51 @@
 
 
 static int
-testReadWrite()
+testReadWrite ()
 {
   char tmp[100 + 1];
   int ret;
 
-  if (strlen(TESTSTRING) !=
-      GNUNET_DISK_fn_write(".testfile", TESTSTRING, strlen(TESTSTRING),
-                           GNUNET_DISK_PERM_USER_READ |
-                           GNUNET_DISK_PERM_USER_WRITE))
+  if (strlen (TESTSTRING) !=
+      GNUNET_DISK_fn_write (".testfile", TESTSTRING, strlen (TESTSTRING),
+                            GNUNET_DISK_PERM_USER_READ
+                            | GNUNET_DISK_PERM_USER_WRITE))
     return 1;
-  if (GNUNET_OK != GNUNET_DISK_file_test(".testfile"))
+  if (GNUNET_OK != GNUNET_DISK_file_test (".testfile"))
     return 1;
-  ret = GNUNET_DISK_fn_read(".testfile", tmp, sizeof(tmp) - 1);
+  ret = GNUNET_DISK_fn_read (".testfile", tmp, sizeof(tmp) - 1);
   if (ret < 0)
-    {
-      fprintf(stderr, "Error reading file `%s' in testReadWrite\n", ".testfile");
-      return 1;
-    }
+  {
+    fprintf (stderr, "Error reading file `%s' in testReadWrite\n", ".testfile");
+    return 1;
+  }
   tmp[ret] = '\0';
-  if (0 != memcmp(tmp, TESTSTRING, strlen(TESTSTRING) + 1))
-    {
-      fprintf(stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
-              TESTSTRING, ".testfile");
-      return 1;
-    }
-  GNUNET_DISK_file_copy(".testfile", ".testfile2");
-  memset(tmp, 0, sizeof(tmp));
-  ret = GNUNET_DISK_fn_read(".testfile2", tmp, sizeof(tmp) - 1);
+  if (0 != memcmp (tmp, TESTSTRING, strlen (TESTSTRING) + 1))
+  {
+    fprintf (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
+             TESTSTRING, ".testfile");
+    return 1;
+  }
+  GNUNET_DISK_file_copy (".testfile", ".testfile2");
+  memset (tmp, 0, sizeof(tmp));
+  ret = GNUNET_DISK_fn_read (".testfile2", tmp, sizeof(tmp) - 1);
   if (ret < 0)
-    {
-      fprintf(stderr, "Error reading file `%s' in testReadWrite\n",
-              ".testfile2");
-      return 1;
-    }
+  {
+    fprintf (stderr, "Error reading file `%s' in testReadWrite\n",
+             ".testfile2");
+    return 1;
+  }
   tmp[ret] = '\0';
-  if (0 != memcmp(tmp, TESTSTRING, strlen(TESTSTRING) + 1))
-    {
-      fprintf(stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
-              TESTSTRING, ".testfile2");
-      return 1;
-    }
-
-  GNUNET_break(0 == unlink(".testfile"));
-  GNUNET_break(0 == unlink(".testfile2"));
-  if (GNUNET_NO != GNUNET_DISK_file_test(".testfile"))
+  if (0 != memcmp (tmp, TESTSTRING, strlen (TESTSTRING) + 1))
+  {
+    fprintf (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp,
+             TESTSTRING, ".testfile2");
+    return 1;
+  }
+
+  GNUNET_break (0 == unlink (".testfile"));
+  GNUNET_break (0 == unlink (".testfile2"));
+  if (GNUNET_NO != GNUNET_DISK_file_test (".testfile"))
     return 1;
 
   return 0;
@@ -82,24 +82,25 @@ testReadWrite()
 
 
 static int
-testOpenClose()
+testOpenClose ()
 {
   struct GNUNET_DISK_FileHandle *fh;
   uint64_t size;
 
-  fh = GNUNET_DISK_file_open(".testfile",
-                             GNUNET_DISK_OPEN_READWRITE |
-                             GNUNET_DISK_OPEN_CREATE,
-                             GNUNET_DISK_PERM_USER_READ |
-                             GNUNET_DISK_PERM_USER_WRITE);
-  GNUNET_assert(GNUNET_NO == GNUNET_DISK_handle_invalid(fh));
-  GNUNET_break(5 == GNUNET_DISK_file_write(fh, "Hello", 5));
-  GNUNET_DISK_file_close(fh);
-  GNUNET_break(GNUNET_OK ==
-               GNUNET_DISK_file_size(".testfile", &size, GNUNET_NO, GNUNET_YES));
+  fh = GNUNET_DISK_file_open (".testfile",
+                              GNUNET_DISK_OPEN_READWRITE
+                              | GNUNET_DISK_OPEN_CREATE,
+                              GNUNET_DISK_PERM_USER_READ
+                              | GNUNET_DISK_PERM_USER_WRITE);
+  GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid (fh));
+  GNUNET_break (5 == GNUNET_DISK_file_write (fh, "Hello", 5));
+  GNUNET_DISK_file_close (fh);
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_DISK_file_size (".testfile", &size, GNUNET_NO,
+                                       GNUNET_YES));
   if (size != 5)
     return 1;
-  GNUNET_break(0 == unlink(".testfile"));
+  GNUNET_break (0 == unlink (".testfile"));
 
   return 0;
 }
@@ -108,48 +109,48 @@ static int ok;
 
 
 static int
-scan_callback(void *want, const char *filename)
+scan_callback (void *want, const char *filename)
 {
-  if (NULL != strstr(filename, want))
+  if (NULL != strstr (filename, want))
     ok++;
   return GNUNET_OK;
 }
 
 
 static int
-testDirScan()
+testDirScan ()
 {
   if (GNUNET_OK !=
-      GNUNET_DISK_directory_create("test" DIR_SEPARATOR_STR "entry"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
+      GNUNET_DISK_directory_create ("test" DIR_SEPARATOR_STR "entry"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   if (GNUNET_OK !=
-      GNUNET_DISK_directory_create("test" DIR_SEPARATOR_STR "entry_more"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  GNUNET_DISK_directory_scan("test", &scan_callback,
-                             "test" DIR_SEPARATOR_STR "entry");
-  if (GNUNET_OK != GNUNET_DISK_directory_remove("test"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
+      GNUNET_DISK_directory_create ("test" DIR_SEPARATOR_STR "entry_more"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  GNUNET_DISK_directory_scan ("test", &scan_callback,
+                              "test" DIR_SEPARATOR_STR "entry");
+  if (GNUNET_OK != GNUNET_DISK_directory_remove ("test"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   if (ok < 2)
-    {
-      GNUNET_break(0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
 
 static int
-iter_callback(void *cls,
-              const char *filename)
+iter_callback (void *cls,
+               const char *filename)
 {
   int *i = cls;
 
@@ -159,130 +160,130 @@ iter_callback(void *cls,
 
 
 static int
-testDirIter()
+testDirIter ()
 {
   int i;
 
   i = 0;
-  if (GNUNET_OK != GNUNET_DISK_directory_create("test/entry"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_OK != GNUNET_DISK_directory_create("test/entry_many"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_OK != GNUNET_DISK_directory_create("test/entry_more"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  GNUNET_DISK_directory_scan("test",
-                             &iter_callback,
-                             &i);
-  if (GNUNET_OK != GNUNET_DISK_directory_remove("test"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
+  if (GNUNET_OK != GNUNET_DISK_directory_create ("test/entry"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_OK != GNUNET_DISK_directory_create ("test/entry_many"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_OK != GNUNET_DISK_directory_create ("test/entry_more"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  GNUNET_DISK_directory_scan ("test",
+                              &iter_callback,
+                              &i);
+  if (GNUNET_OK != GNUNET_DISK_directory_remove ("test"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   if (i < 3)
-    {
-      GNUNET_break(0);
-      return 1;
-    }
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
 
 static int
-testCanonicalize()
+testCanonicalize ()
 {
-  char *fn = GNUNET_strdup("ab?><|cd*ef:/g\"");
-
-  GNUNET_DISK_filename_canonicalize(fn);
-  if (0 != strcmp(fn, "ab____cd_ef__g_"))
-    {
-      GNUNET_free(fn);
-      return 1;
-    }
-  GNUNET_free(fn);
+  char *fn = GNUNET_strdup ("ab?><|cd*ef:/g\"");
+
+  GNUNET_DISK_filename_canonicalize (fn);
+  if (0 != strcmp (fn, "ab____cd_ef__g_"))
+  {
+    GNUNET_free (fn);
+    return 1;
+  }
+  GNUNET_free (fn);
   return 0;
 }
 
 
 static int
-testChangeOwner()
+testChangeOwner ()
 {
-  GNUNET_log_skip(1, GNUNET_NO);
-  if (GNUNET_OK == GNUNET_DISK_file_change_owner("/dev/null", "unknownuser"))
+  GNUNET_log_skip (1, GNUNET_NO);
+  if (GNUNET_OK == GNUNET_DISK_file_change_owner ("/dev/null", "unknownuser"))
     return 1;
   return 0;
 }
 
 
 static int
-testDirMani()
+testDirMani ()
 {
-  if (GNUNET_OK != GNUNET_DISK_directory_create_for_file("test/ing"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_NO != GNUNET_DISK_file_test("test"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_NO != GNUNET_DISK_file_test("test/ing"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_OK != GNUNET_DISK_directory_remove("test"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_OK != GNUNET_DISK_directory_create("test"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_YES != GNUNET_DISK_directory_test("test", GNUNET_YES))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
-  if (GNUNET_OK != GNUNET_DISK_directory_remove("test"))
-    {
-      GNUNET_break(0);
-      return 1;
-    }
+  if (GNUNET_OK != GNUNET_DISK_directory_create_for_file ("test/ing"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_NO != GNUNET_DISK_file_test ("test"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_NO != GNUNET_DISK_file_test ("test/ing"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_OK != GNUNET_DISK_directory_remove ("test"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_OK != GNUNET_DISK_directory_create ("test"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_YES != GNUNET_DISK_directory_test ("test", GNUNET_YES))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  if (GNUNET_OK != GNUNET_DISK_directory_remove ("test"))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
   return 0;
 }
 
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   unsigned int failureCount = 0;
 
-  GNUNET_log_setup("test-disk", "WARNING", NULL);
-  failureCount += testReadWrite();
-  failureCount += testOpenClose();
-  failureCount += testDirScan();
-  failureCount += testDirIter();
-  failureCount += testCanonicalize();
-  failureCount += testChangeOwner();
-  failureCount += testDirMani();
+  GNUNET_log_setup ("test-disk", "WARNING", NULL);
+  failureCount += testReadWrite ();
+  failureCount += testOpenClose ();
+  failureCount += testDirScan ();
+  failureCount += testDirIter ();
+  failureCount += testCanonicalize ();
+  failureCount += testChangeOwner ();
+  failureCount += testDirMani ();
   if (0 != failureCount)
-    {
-      fprintf(stderr,
-              "\n%u TESTS FAILED!\n",
-              failureCount);
-      return -1;
-    }
+  {
+    fprintf (stderr,
+             "\n%u TESTS FAILED!\n",
+             failureCount);
+    return -1;
+  }
   return 0;
 }                               /* end of main */