indentation

5 files changed, 117 insertions, 145 deletions

diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 160993649..26fec5289 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -124,10 +124,9 @@ make_info_message (const struct HostEntry *he)
  * @return GNUNET_NO if expiration smaller than the current time
  */
 static int
-discard_expired (void *cls,
-                 const char *tname,
-                 struct GNUNET_TIME_Absolute expiration,
-                 const void *addr, uint16_t addrlen)
+discard_expired (void *cls, const char *tname,
+                 struct GNUNET_TIME_Absolute expiration, const void *addr,
+                 uint16_t addrlen)
 {
   const struct GNUNET_TIME_Absolute *now = cls;
 
@@ -170,8 +169,8 @@ notify_all (struct HostEntry *entry)
   struct InfoMessage *msg;
 
   msg = make_info_message (entry);
-  GNUNET_SERVER_notification_context_broadcast (notify_list,
-                                                &msg->header, GNUNET_NO);
+  GNUNET_SERVER_notification_context_broadcast (notify_list, &msg->header,
+                                                GNUNET_NO);
   GNUNET_free (msg);
 }
 
@@ -195,8 +194,8 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
   entry = GNUNET_CONTAINER_multihashmap_get (hostmap, &identity->hashPubKey);
   if (entry != NULL)
     return;
-  GNUNET_STATISTICS_update (stats,
-                            gettext_noop ("# peers known"), 1, GNUNET_NO);
+  GNUNET_STATISTICS_update (stats, gettext_noop ("# peers known"), 1,
+                            GNUNET_NO);
   entry = GNUNET_malloc (sizeof (struct HostEntry));
   entry->identity = *identity;
 
@@ -216,16 +215,14 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
     else
     {
       now = GNUNET_TIME_absolute_get ();
-      hello_clean = GNUNET_HELLO_iterate_addresses (hello,
-                                                    GNUNET_YES,
-                                                    &discard_expired, &now);
+      hello_clean =
+          GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired,
+                                          &now);
       entry->hello = hello_clean;
     }
   }
   GNUNET_free (fn);
-  GNUNET_CONTAINER_multihashmap_put (hostmap,
-                                     &identity->hashPubKey,
-                                     entry,
+  GNUNET_CONTAINER_multihashmap_put (hostmap, &identity->hashPubKey, entry,
                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
   notify_all (entry);
 }
@@ -244,8 +241,8 @@ remove_garbage (const char *fullname)
                 ("File `%s' in directory `%s' does not match naming convention. "
                  "Removed.\n"), fullname, networkIdDirectory);
   else
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR |
-                              GNUNET_ERROR_TYPE_BULK, "unlink", fullname);
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                              "unlink", fullname);
 }
 
 
@@ -271,8 +268,8 @@ hosts_directory_scan_callback (void *cls, const char *fullname)
     remove_garbage (fullname);
     return GNUNET_OK;
   }
-  if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (filename,
-                                                   &identity.hashPubKey))
+  if (GNUNET_OK !=
+      GNUNET_CRYPTO_hash_from_string (filename, &identity.hashPubKey))
   {
     remove_garbage (fullname);
     return GNUNET_OK;
@@ -305,11 +302,10 @@ cron_scan_directory_data_hosts (void *cls,
   GNUNET_DISK_directory_scan (networkIdDirectory,
                               &hosts_directory_scan_callback, &count);
   if ((0 == count) && (0 == (++retries & 31)))
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING |
-                GNUNET_ERROR_TYPE_BULK,
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
                 _("Still no peers found in `%s'!\n"), networkIdDirectory);
-  GNUNET_SCHEDULER_add_delayed (DATA_HOST_FREQ,
-                                &cron_scan_directory_data_hosts, NULL);
+  GNUNET_SCHEDULER_add_delayed (DATA_HOST_FREQ, &cron_scan_directory_data_hosts,
+                                NULL);
 }
 
 
@@ -352,9 +348,7 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
   if (GNUNET_OK == GNUNET_DISK_directory_create_for_file (fn))
   {
     if (GNUNET_SYSERR ==
-        GNUNET_DISK_fn_write (fn,
-                              host->hello,
-                              GNUNET_HELLO_size (host->hello),
+        GNUNET_DISK_fn_write (fn, host->hello, GNUNET_HELLO_size (host->hello),
                               GNUNET_DISK_PERM_USER_READ |
                               GNUNET_DISK_PERM_USER_WRITE |
                               GNUNET_DISK_PERM_GROUP_READ |
@@ -425,14 +419,11 @@ discard_hosts_helper (void *cls, const char *fn)
     return GNUNET_OK;
   }
   hello = (const struct GNUNET_HELLO_Message *) buffer;
-  new_hello = GNUNET_HELLO_iterate_addresses (hello,
-                                              GNUNET_YES,
-                                              &discard_expired, now);
+  new_hello =
+      GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired, now);
   if (new_hello != NULL)
   {
-    GNUNET_DISK_fn_write (fn,
-                          new_hello,
-                          GNUNET_HELLO_size (new_hello),
+    GNUNET_DISK_fn_write (fn, new_hello, GNUNET_HELLO_size (new_hello),
                           GNUNET_DISK_PERM_USER_READ |
                           GNUNET_DISK_PERM_USER_WRITE |
                           GNUNET_DISK_PERM_GROUP_READ |
@@ -461,8 +452,8 @@ cron_clean_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   now = GNUNET_TIME_absolute_get ();
   GNUNET_DISK_directory_scan (networkIdDirectory, &discard_hosts_helper, &now);
-  GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ,
-                                &cron_clean_data_hosts, NULL);
+  GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ, &cron_clean_data_hosts,
+                                NULL);
 }
 
 
@@ -474,8 +465,7 @@ cron_clean_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param message the actual message
  */
 static void
-handle_hello (void *cls,
-              struct GNUNET_SERVER_Client *client,
+handle_hello (void *cls, struct GNUNET_SERVER_Client *client,
               const struct GNUNET_MessageHeader *message)
 {
   const struct GNUNET_HELLO_Message *hello;
@@ -489,8 +479,7 @@ handle_hello (void *cls,
     return;
   }
 #if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s' message received for peer `%4s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n",
               "HELLO", GNUNET_i2s (&pid));
 #endif
   bind_address (&pid, hello);
@@ -506,8 +495,7 @@ handle_hello (void *cls,
  * @param message the actual message
  */
 static void
-handle_get (void *cls,
-            struct GNUNET_SERVER_Client *client,
+handle_get (void *cls, struct GNUNET_SERVER_Client *client,
             const struct GNUNET_MessageHeader *message)
 {
   const struct ListPeerMessage *lpm;
@@ -516,13 +504,11 @@ handle_get (void *cls,
   lpm = (const struct ListPeerMessage *) message;
   GNUNET_break (0 == ntohl (lpm->reserved));
 #if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s' message received for peer `%4s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n",
               "GET", GNUNET_i2s (&lpm->peer));
 #endif
   tc = GNUNET_SERVER_transmit_context_create (client);
-  GNUNET_CONTAINER_multihashmap_get_multiple (hostmap,
-                                              &lpm->peer.hashPubKey,
+  GNUNET_CONTAINER_multihashmap_get_multiple (hostmap, &lpm->peer.hashPubKey,
                                               &add_to_tc, tc);
   GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
                                               GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
@@ -538,8 +524,7 @@ handle_get (void *cls,
  * @param message the actual message
  */
 static void
-handle_get_all (void *cls,
-                struct GNUNET_SERVER_Client *client,
+handle_get_all (void *cls, struct GNUNET_SERVER_Client *client,
                 const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_SERVER_TransmitContext *tc;
@@ -563,8 +548,8 @@ do_notify_entry (void *cls, const GNUNET_HashCode * key, void *value)
   struct InfoMessage *msg;
 
   msg = make_info_message (he);
-  GNUNET_SERVER_notification_context_unicast (notify_list,
-                                              client, &msg->header, GNUNET_NO);
+  GNUNET_SERVER_notification_context_unicast (notify_list, client, &msg->header,
+                                              GNUNET_NO);
   GNUNET_free (msg);
   return GNUNET_YES;
 }
@@ -578,8 +563,7 @@ do_notify_entry (void *cls, const GNUNET_HashCode * key, void *value)
  * @param message the actual message
  */
 static void
-handle_notify (void *cls,
-               struct GNUNET_SERVER_Client *client,
+handle_notify (void *cls, struct GNUNET_SERVER_Client *client,
                const struct GNUNET_MessageHeader *message)
 {
 #if DEBUG_PEERINFO
@@ -630,8 +614,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param cfg configuration to use
  */
 static void
-run (void *cls,
-     struct GNUNET_SERVER_Handle *server,
+run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
@@ -649,8 +632,7 @@ run (void *cls,
   stats = GNUNET_STATISTICS_create ("peerinfo", cfg);
   notify_list = GNUNET_SERVER_notification_context_create (server, 0);
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                          "peerinfo",
+                 GNUNET_CONFIGURATION_get_value_filename (cfg, "peerinfo",
                                                           "HOSTS",
                                                           &networkIdDirectory));
   GNUNET_DISK_directory_create (networkIdDirectory);
@@ -658,8 +640,8 @@ run (void *cls,
                                       &cron_scan_directory_data_hosts, NULL);
   GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
                                       &cron_clean_data_hosts, NULL);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+                                NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
 }
 
@@ -676,11 +658,10 @@ main (int argc, char *const *argv)
 {
   int ret;
 
-  ret = (GNUNET_OK ==
-         GNUNET_SERVICE_run (argc,
-                             argv,
-                             "peerinfo",
-                             GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1;
+  ret =
+      (GNUNET_OK ==
+       GNUNET_SERVICE_run (argc, argv, "peerinfo", GNUNET_SERVICE_OPTION_NONE,
+                           &run, NULL)) ? 0 : 1;
   GNUNET_free_non_null (networkIdDirectory);
   return ret;
 }
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 444ae98e2..4febf2eeb 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -240,8 +240,9 @@ reconnect (struct GNUNET_PEERINFO_Handle *h)
   h->client = GNUNET_CLIENT_connect ("peerinfo", h->cfg);
   if (NULL == h->client)
   {
-    h->r_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                              &reconnect_task, h);
+    h->r_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect_task,
+                                      h);
     return;
   }
   trigger_transmit (h);
@@ -283,8 +284,8 @@ do_transmit (void *cls, size_t size, void *buf)
   memcpy (buf, &tqe[1], ret);
 #if DEBUG_PEERINFO
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting request of size %u to `%s' service.\n",
-              ret, "PEERINFO");
+              "Transmitting request of size %u to `%s' service.\n", ret,
+              "PEERINFO");
 #endif
   GNUNET_CONTAINER_DLL_remove (h->tq_head, h->tq_tail, tqe);
   if (tqe->cont != NULL)
@@ -318,11 +319,11 @@ trigger_transmit (struct GNUNET_PEERINFO_Handle *h)
     reconnect (h);
     return;
   }
-  h->th = GNUNET_CLIENT_notify_transmit_ready (h->client,
-                                               tqe->size,
-                                               GNUNET_TIME_absolute_get_remaining
-                                               (tqe->timeout), GNUNET_YES,
-                                               &do_transmit, h);
+  h->th =
+      GNUNET_CLIENT_notify_transmit_ready (h->client, tqe->size,
+                                           GNUNET_TIME_absolute_get_remaining
+                                           (tqe->timeout), GNUNET_YES,
+                                           &do_transmit, h);
 }
 
 
@@ -487,9 +488,8 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
   ic->h->in_receive = GNUNET_YES;
   if (ic->callback != NULL)
     ic->callback (ic->callback_cls, &im->peer, hello, NULL);
-  GNUNET_CLIENT_receive (ic->h->client,
-                         &peerinfo_handler,
-                         ic, GNUNET_TIME_absolute_get_remaining (ic->timeout));
+  GNUNET_CLIENT_receive (ic->h->client, &peerinfo_handler, ic,
+                         GNUNET_TIME_absolute_get_remaining (ic->timeout));
 }
 
 
@@ -527,9 +527,8 @@ iterator_start_receive (void *cls, int transmit_success)
   ic->h->in_receive = GNUNET_YES;
   ic->in_receive = GNUNET_YES;
   ic->tqe = NULL;
-  GNUNET_CLIENT_receive (ic->h->client,
-                         &peerinfo_handler,
-                         ic, GNUNET_TIME_absolute_get_remaining (ic->timeout));
+  GNUNET_CLIENT_receive (ic->h->client, &peerinfo_handler, ic,
+                         GNUNET_TIME_absolute_get_remaining (ic->timeout));
 }
 
 
@@ -549,8 +548,7 @@ signal_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_CONTAINER_DLL_remove (ic->h->tq_head, ic->h->tq_tail, ic->tqe);
   else
     reconnect (ic->h);
-  ic->callback (ic->callback_cls,
-                NULL, NULL,
+  ic->callback (ic->callback_cls, NULL, NULL,
                 _
                 ("Timeout transmitting iteration request to `PEERINFO' service.\n"));
   ic->callback = NULL;
@@ -592,8 +590,9 @@ GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Requesting list of peers from PEERINFO service\n");
 #endif
-    tqe = GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
-                         sizeof (struct GNUNET_MessageHeader));
+    tqe =
+        GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
+                       sizeof (struct GNUNET_MessageHeader));
     tqe->size = sizeof (struct GNUNET_MessageHeader);
     lapm = (struct GNUNET_MessageHeader *) &tqe[1];
     lapm->size = htons (sizeof (struct GNUNET_MessageHeader));
@@ -606,8 +605,9 @@ GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
                 "Requesting information on peer `%4s' from PEERINFO service\n",
                 GNUNET_i2s (peer));
 #endif
-    tqe = GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
-                         sizeof (struct ListPeerMessage));
+    tqe =
+        GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
+                       sizeof (struct ListPeerMessage));
     tqe->size = sizeof (struct ListPeerMessage);
     lpm = (struct ListPeerMessage *) &tqe[1];
     lpm->header.size = htons (sizeof (struct ListPeerMessage));
@@ -620,8 +620,8 @@ GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
   ic->callback = callback;
   ic->callback_cls = callback_cls;
   ic->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-  ic->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
-                                                   &signal_timeout, ic);
+  ic->timeout_task =
+      GNUNET_SCHEDULER_add_delayed (timeout, &signal_timeout, ic);
   tqe->timeout = ic->timeout;
   tqe->cont = &iterator_start_receive;
   tqe->cont_cls = ic;
diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index 0c7474f4a..4ec7b2192 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -104,8 +104,8 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL == nc->client)
   {
     /* ugh */
-    nc->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                             &reconnect, nc);
+    nc->task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, nc);
     return;
   }
   request_notifications (nc);
@@ -176,9 +176,8 @@ process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
 static void
 receive_notifications (struct GNUNET_PEERINFO_NotifyContext *nc)
 {
-  GNUNET_CLIENT_receive (nc->client,
-                         &process_notification,
-                         nc, GNUNET_TIME_UNIT_FOREVER_REL);
+  GNUNET_CLIENT_receive (nc->client, &process_notification, nc,
+                         GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 
@@ -223,12 +222,12 @@ static void
 request_notifications (struct GNUNET_PEERINFO_NotifyContext *nc)
 {
   GNUNET_assert (NULL == nc->init);
-  nc->init = GNUNET_CLIENT_notify_transmit_ready (nc->client,
-                                                  sizeof (struct
-                                                          GNUNET_MessageHeader),
-                                                  GNUNET_TIME_UNIT_FOREVER_REL,
-                                                  GNUNET_YES,
-                                                  &transmit_notify_request, nc);
+  nc->init =
+      GNUNET_CLIENT_notify_transmit_ready (nc->client,
+                                           sizeof (struct GNUNET_MessageHeader),
+                                           GNUNET_TIME_UNIT_FOREVER_REL,
+                                           GNUNET_YES, &transmit_notify_request,
+                                           nc);
 }
 
 
diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c
index d0eadaf94..d9107c8fe 100755
--- a/src/peerinfo/perf_peerinfo_api.c
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -47,9 +47,7 @@ static struct GNUNET_PEERINFO_Handle *h;
 static unsigned int numpeers;
 
 static int
-check_it (void *cls,
-          const char *tname,
-          struct GNUNET_TIME_Absolute expiration,
+check_it (void *cls, const char *tname, struct GNUNET_TIME_Absolute expiration,
           const void *addr, uint16_t addrlen)
 {
 #if DEBUG
@@ -74,10 +72,11 @@ address_generator (void *cls, size_t max, void *buf)
 
   GNUNET_asprintf (&address, "Address%d", *agc);
 
-  ret = GNUNET_HELLO_add_address ("peerinfotest",
-                                  GNUNET_TIME_relative_to_absolute
-                                  (GNUNET_TIME_UNIT_HOURS),
-                                  address, strlen (address) + 1, buf, max);
+  ret =
+      GNUNET_HELLO_add_address ("peerinfotest",
+                                GNUNET_TIME_relative_to_absolute
+                                (GNUNET_TIME_UNIT_HOURS), address,
+                                strlen (address) + 1, buf, max);
   GNUNET_free (address);
   *agc = 0;
   return ret;
@@ -100,8 +99,7 @@ add_peer (size_t i)
 
 
 static void
-process (void *cls,
-         const struct GNUNET_PeerIdentity *peer,
+process (void *cls, const struct GNUNET_PeerIdentity *peer,
          const struct GNUNET_HELLO_Message *hello, const char *err_msg)
 {
   if (peer == NULL)
@@ -124,9 +122,8 @@ process (void *cls,
 
 
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   size_t i;
 
@@ -136,11 +133,10 @@ run (void *cls,
   for (i = 0; i < NUM_REQUESTS; i++)
   {
     add_peer (i);
-    ic[i] = GNUNET_PEERINFO_iterate (h,
-                                     NULL,
-                                     GNUNET_TIME_relative_multiply
-                                     (GNUNET_TIME_UNIT_SECONDS, 30),
-                                     &process, cls);
+    ic[i] =
+        GNUNET_PEERINFO_iterate (h, NULL,
+                                 GNUNET_TIME_relative_multiply
+                                 (GNUNET_TIME_UNIT_SECONDS, 30), &process, cls);
   }
 }
 
@@ -165,21 +161,21 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
-                                  "gnunet-service-peerinfo",
+  proc =
+      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
+                               "gnunet-service-peerinfo",
 #if DEBUG_PEERINFO
-                                  "-L", "DEBUG",
+                               "-L", "DEBUG",
 #else
-                                  "-L", "ERROR",
+                               "-L", "ERROR",
 #endif
-                                  "-c", "test_peerinfo_api_data.conf", NULL);
+                               "-c", "test_peerinfo_api_data.conf", NULL);
 #endif
   GNUNET_assert (NULL != proc);
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "perf-peerinfo-api", "nohelp", options, &run, &ok);
-  fprintf (stderr,
-           "Received %u/%u calls before timeout\n",
-           numpeers, NUM_REQUESTS * NUM_REQUESTS / 2);
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                      "perf-peerinfo-api", "nohelp", options, &run, &ok);
+  fprintf (stderr, "Received %u/%u calls before timeout\n", numpeers,
+           NUM_REQUESTS * NUM_REQUESTS / 2);
   GAUGER ("PEERINFO", "Peerinfo lookups", numpeers / 30, "peers/s");
 #if START_SERVICE
   if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index e740f1fc9..bbdc591f4 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -45,9 +45,7 @@ static struct GNUNET_PEERINFO_Handle *h;
 static unsigned int retries;
 
 static int
-check_it (void *cls,
-          const char *tname,
-          struct GNUNET_TIME_Absolute expiration,
+check_it (void *cls, const char *tname, struct GNUNET_TIME_Absolute expiration,
           const void *addr, uint16_t addrlen)
 {
   unsigned int *agc = cls;
@@ -70,10 +68,11 @@ address_generator (void *cls, size_t max, void *buf)
 
   if (0 == *agc)
     return 0;
-  ret = GNUNET_HELLO_add_address ("peerinfotest",
-                                  GNUNET_TIME_relative_to_absolute
-                                  (GNUNET_TIME_UNIT_HOURS), "Address", *agc,
-                                  buf, max);
+  ret =
+      GNUNET_HELLO_add_address ("peerinfotest",
+                                GNUNET_TIME_relative_to_absolute
+                                (GNUNET_TIME_UNIT_HOURS), "Address", *agc, buf,
+                                max);
   (*agc)--;
   return ret;
 }
@@ -98,8 +97,7 @@ add_peer ()
 
 
 static void
-process (void *cls,
-         const struct GNUNET_PeerIdentity *peer,
+process (void *cls, const struct GNUNET_PeerIdentity *peer,
          const struct GNUNET_HELLO_Message *hello, const char *err_msg)
 {
   int *ok = cls;
@@ -119,11 +117,10 @@ process (void *cls,
       /* try again */
       retries++;
       add_peer ();
-      ic = GNUNET_PEERINFO_iterate (h,
-                                    NULL,
+      ic = GNUNET_PEERINFO_iterate (h, NULL,
                                     GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 15),
-                                    &process, cls);
+                                    (GNUNET_TIME_UNIT_SECONDS, 15), &process,
+                                    cls);
       return;
     }
     GNUNET_assert (peer == NULL);
@@ -145,16 +142,14 @@ process (void *cls,
 
 
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   cfg = c;
   h = GNUNET_PEERINFO_connect (cfg);
   GNUNET_assert (h != NULL);
   add_peer ();
-  ic = GNUNET_PEERINFO_iterate (h,
-                                NULL,
+  ic = GNUNET_PEERINFO_iterate (h, NULL,
                                 GNUNET_TIME_relative_multiply
                                 (GNUNET_TIME_UNIT_SECONDS, 15), &process, cls);
 }
@@ -177,15 +172,16 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
-                                  "gnunet-service-peerinfo",
+  proc =
+      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
+                               "gnunet-service-peerinfo",
 #if DEBUG_PEERINFO
-                                  "-L", "DEBUG",
+                               "-L", "DEBUG",
 #endif
-                                  "-c", "test_peerinfo_api_data.conf", NULL);
+                               "-c", "test_peerinfo_api_data.conf", NULL);
   GNUNET_assert (NULL != proc);
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-peerinfo-api", "nohelp", options, &run, &ok);
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                      "test-peerinfo-api", "nohelp", options, &run, &ok);
   if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");