1 files changed, 75 insertions, 72 deletions

diff --git a/src/dht/test_dhtlog.c b/src/dht/test_dhtlog.c
index 5c6d5c578..4021f5db5 100644
--- a/src/dht/test_dhtlog.c
+++ b/src/dht/test_dhtlog.c
@@ -37,7 +37,7 @@ static int ok;
  * Actual test of the service operations
  */
 static int
-test (struct GNUNET_DHTLOG_Handle * api)
+test (struct GNUNET_DHTLOG_Handle *api)
 {
   struct GNUNET_PeerIdentity p1;
   struct GNUNET_PeerIdentity p2;
@@ -53,6 +53,7 @@ test (struct GNUNET_DHTLOG_Handle * api)
   unsigned long long nodeuid = 0;
   unsigned long long internaluid = 1010223344LL;
   unsigned long long dhtkeyuid = 0;
+
   memset (&p1.hashPubKey, 3, sizeof (GNUNET_HashCode));
   memset (&p2.hashPubKey, 4, sizeof (GNUNET_HashCode));
   memset (&p3.hashPubKey, 5, sizeof (GNUNET_HashCode));
@@ -60,7 +61,7 @@ test (struct GNUNET_DHTLOG_Handle * api)
 
   memset (&k1, 0, sizeof (GNUNET_HashCode));
   memset (&k2, 1, sizeof (GNUNET_HashCode));
-  memset(&trial_info, 0, sizeof(struct GNUNET_DHTLOG_TrialInfo));
+  memset (&trial_info, 0, sizeof (struct GNUNET_DHTLOG_TrialInfo));
   trial_info.other_identifier = 777;
   trial_info.num_nodes = i;
   trial_info.topology = 5;
@@ -83,107 +84,110 @@ test (struct GNUNET_DHTLOG_Handle * api)
   trial_info.stop_closest = 1;
   trial_info.stop_found = 0;
   trial_info.strict_kademlia = 1;
-  trial_info.message = GNUNET_strdup("TEST INSERT_TRIAL");
-  ret =
-    api->insert_trial (&trial_info);
-  GNUNET_free(trial_info.message);
-  CHECK(ret);
+  trial_info.message = GNUNET_strdup ("TEST INSERT_TRIAL");
+  ret = api->insert_trial (&trial_info);
+  GNUNET_free (trial_info.message);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert trial succeeded!\n");
+  fprintf (stderr, "Insert trial succeeded!\n");
 #endif
-  ret = api->insert_topology(500);
-  CHECK(ret);
+  ret = api->insert_topology (500);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert topology succeeded!\n");
+  fprintf (stderr, "Insert topology succeeded!\n");
 #endif
   ret = api->insert_node (&nodeuid, &p1);
-  CHECK(ret);
+  CHECK (ret);
   ret = api->insert_node (&nodeuid, &p2);
-  CHECK(ret);
+  CHECK (ret);
   ret = api->insert_node (&nodeuid, &p3);
-  CHECK(ret);
+  CHECK (ret);
   ret = api->insert_node (&nodeuid, &p4);
-  CHECK(ret);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert node succeeded!\n");
+  fprintf (stderr, "Insert node succeeded!\n");
 #endif
-  ret = api->set_malicious(&p1);
-  CHECK(ret);
+  ret = api->set_malicious (&p1);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Set malicious succeeded!\n");
+  fprintf (stderr, "Set malicious succeeded!\n");
 #endif
-  ret = api->insert_topology(0);
-  CHECK(ret);
+  ret = api->insert_topology (0);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert topology succeeded!\n");
+  fprintf (stderr, "Insert topology succeeded!\n");
 #endif
-  ret = api->insert_extended_topology(&p1, &p2);
-  CHECK(ret);
-  ret = api->insert_extended_topology(&p3, &p4);
-  CHECK(ret);
+  ret = api->insert_extended_topology (&p1, &p2);
+  CHECK (ret);
+  ret = api->insert_extended_topology (&p3, &p4);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert extended topology succeeded!\n");
+  fprintf (stderr, "Insert extended topology succeeded!\n");
 #endif
-  ret = api->update_topology(101);
-  CHECK(ret);
+  ret = api->update_topology (101);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Update topology succeeded!\n");
+  fprintf (stderr, "Update topology succeeded!\n");
 #endif
   ret = api->insert_dhtkey (&dhtkeyuid, &k1);
-  CHECK(ret);
+  CHECK (ret);
   ret = api->insert_dhtkey (&dhtkeyuid, &k2);
-  CHECK(ret);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert dhtkey succeeded!\n");
+  fprintf (stderr, "Insert dhtkey succeeded!\n");
 #endif
   ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1);
-  CHECK(ret);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert query succeeded!\n");
+  fprintf (stderr, "Insert query succeeded!\n");
 #endif
   ret =
-    api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 1, DHTLOG_GET, &p1, &k2,
-                       &p4, &p3);
-  CHECK(ret);
+      api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 1, DHTLOG_GET, &p1, &k2,
+                         &p4, &p3);
+  CHECK (ret);
   ret =
-    api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 0, DHTLOG_PUT, &p3, &k1,
-                       &p4, &p2);
-  CHECK(ret);
+      api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 0, DHTLOG_PUT, &p3, &k1,
+                         &p4, &p2);
+  CHECK (ret);
   ret =
-    api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 1, DHTLOG_ROUTE, &p3, &k2,
-                       &p2, NULL);
-  CHECK(ret);
+      api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 1, DHTLOG_ROUTE, &p3,
+                         &k2, &p2, NULL);
+  CHECK (ret);
   ret =
-    api->insert_route (&sqlrouteuid, sqlqueryuid, 4, 7, DHTLOG_ROUTE, &p3, &k2,
-                       NULL, NULL);
-  CHECK(ret);
+      api->insert_route (&sqlrouteuid, sqlqueryuid, 4, 7, DHTLOG_ROUTE, &p3,
+                         &k2, NULL, NULL);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert route succeeded!\n");
+  fprintf (stderr, "Insert route succeeded!\n");
 #endif
   sleep (1);
-  ret = api->insert_stat(&p1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
-  CHECK(ret);
-  ret = api->insert_stat(&p2, 12, 23, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27);
-  CHECK(ret);
+  ret =
+      api->insert_stat (&p1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+                        17);
+  CHECK (ret);
+  ret =
+      api->insert_stat (&p2, 12, 23, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+                        25, 26, 27);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert stat succeeded!\n");
+  fprintf (stderr, "Insert stat succeeded!\n");
 #endif
   ret = api->update_trial (787);
-  CHECK(ret);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Update trial succeeded!\n");
+  fprintf (stderr, "Update trial succeeded!\n");
 #endif
   ret = api->add_generic_stat (&p2, "nonsense", "section", 77765);
-  CHECK(ret);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert generic stat succeeded!\n");
+  fprintf (stderr, "Insert generic stat succeeded!\n");
 #endif
-  ret = api->insert_round(401, 507);
-  CHECK(ret);
-  ret = api->insert_round_details(402, 507, 1123, 985);
-  CHECK(ret);
+  ret = api->insert_round (401, 507);
+  CHECK (ret);
+  ret = api->insert_round_details (402, 507, 1123, 985);
+  CHECK (ret);
 #if VERBOSE
-  fprintf(stderr, "Insert round succeeded!\n");
+  fprintf (stderr, "Insert round succeeded!\n");
 #endif
   return 0;
 }
@@ -193,21 +197,21 @@ test (struct GNUNET_DHTLOG_Handle * api)
 static void
 run (void *cls,
      char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_DHTLOG_Handle *api;
+
   ok = 0;
   api = GNUNET_DHTLOG_connect (cfg);
 
   if (api == NULL)
-    {
-      ok = 1;
-      return;
-    }
-  ok = test(api);
+  {
+    ok = 1;
+    return;
+  }
+  ok = test (api);
 
-  GNUNET_DHTLOG_disconnect(api);
+  GNUNET_DHTLOG_disconnect (api);
 }
 
 
@@ -226,8 +230,7 @@ check ()
     GNUNET_GETOPT_OPTION_END
   };
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-dhtlog-api", "nohelp",
-                      options, &run, NULL);
+                      argv, "test-dhtlog-api", "nohelp", options, &run, NULL);
   if (ok != 0)
     fprintf (stderr, "Test failed with error code: %d\n", ok);
   return ok;