even nicer indentation, thanks to LRN's indent patch

19 files changed, 84 insertions, 81 deletions

diff --git a/src/util/client.c b/src/util/client.c
index 59cd26ad1..2b866e6f8 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -452,8 +452,8 @@ check_complete (struct GNUNET_CLIENT_Connection *conn)
 {
   if ((conn->received_pos >= sizeof (struct GNUNET_MessageHeader)) &&
       (conn->received_pos >=
-       ntohs (((const struct GNUNET_MessageHeader *) conn->
-               received_buf)->size)))
+       ntohs (((const struct GNUNET_MessageHeader *) conn->received_buf)->
+              size)))
     conn->msg_complete = GNUNET_YES;
 }
 
@@ -679,8 +679,8 @@ write_test (void *cls, size_t size, void *buf)
   msg->type = htons (GNUNET_MESSAGE_TYPE_TEST);
   msg->size = htons (sizeof (struct GNUNET_MessageHeader));
   GNUNET_CLIENT_receive (conn, &confirm_handler, conn,
-                         GNUNET_TIME_absolute_get_remaining (conn->
-                                                             test_deadline));
+                         GNUNET_TIME_absolute_get_remaining
+                         (conn->test_deadline));
   return sizeof (struct GNUNET_MessageHeader);
 }
 
@@ -902,7 +902,8 @@ GNUNET_CLIENT_service_test (const char *service,
  * @param buf where to write them
  * @return number of bytes written to buf
  */
-static size_t client_notify (void *cls, size_t size, void *buf);
+static size_t
+client_notify (void *cls, size_t size, void *buf);
 
 
 /**
diff --git a/src/util/connection.c b/src/util/connection.c
index 39cb1dde2..9aeca9096 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -506,8 +506,8 @@ GNUNET_CONNECTION_get_address (struct GNUNET_CONNECTION_Handle *sock,
  * @param cls our connection handle
  * @param tc task context describing why we are here
  */
-static void receive_again (void *cls,
-                           const struct GNUNET_SCHEDULER_TaskContext *tc);
+static void
+receive_again (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
 /**
@@ -619,8 +619,8 @@ destroy_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param cls our connection handle
  * @param tc task context describing why we are here
  */
-static void transmit_ready (void *cls,
-                            const struct GNUNET_SCHEDULER_TaskContext *tc);
+static void
+transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
 /**
@@ -867,13 +867,13 @@ try_connect_using_address (void *cls, const struct sockaddr *addr,
   if (h->nth.notify_ready != NULL)
     delay =
         GNUNET_TIME_relative_min (delay,
-                                  GNUNET_TIME_absolute_get_remaining (h->nth.
-                                                                      transmit_timeout));
+                                  GNUNET_TIME_absolute_get_remaining (h->
+                                                                      nth.transmit_timeout));
   if (h->receiver != NULL)
     delay =
         GNUNET_TIME_relative_min (delay,
-                                  GNUNET_TIME_absolute_get_remaining (h->
-                                                                      receive_timeout));
+                                  GNUNET_TIME_absolute_get_remaining
+                                  (h->receive_timeout));
   ap->task =
       GNUNET_SCHEDULER_add_write_net (delay, ap->sock,
                                       &connect_probe_continuation, ap);
@@ -1152,9 +1152,8 @@ receive_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Receive from `%s' encounters error: time out by %llums... (%p)\n",
                   GNUNET_a2s (sh->addr, sh->addrlen),
-                  GNUNET_TIME_absolute_get_duration (sh->
-                                                     receive_timeout).rel_value,
-                  sh);
+                  GNUNET_TIME_absolute_get_duration (sh->receive_timeout).
+                  rel_value, sh);
 #endif
     signal_timeout (sh);
     return;
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index ef6bcc892..059a5b253 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -292,11 +292,8 @@ insert_node (struct GNUNET_CONTAINER_Heap *heap,
 
   GNUNET_assert (node->parent == NULL);
   while ((heap->order == GNUNET_CONTAINER_HEAP_ORDER_MAX) ? (pos->cost >=
-                                                             node->
-                                                             cost) : (pos->
-                                                                      cost <=
-                                                                      node->
-                                                                      cost))
+                                                             node->cost)
+         : (pos->cost <= node->cost))
   {
     /* node is descendent of pos */
     pos->tree_size += (1 + node->tree_size);
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index c67e96dac..eb515e8fb 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -1165,9 +1165,9 @@ GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size)
     else
       mime_type = &mdata[left];
     GNUNET_CONTAINER_meta_data_insert (md, plugin_name,
-                                       (enum EXTRACTOR_MetaType) ntohl (ent.
-                                                                        type),
-                                       format, mime_type, meta_data, dlen);
+                                       (enum EXTRACTOR_MetaType)
+                                       ntohl (ent.type), format, mime_type,
+                                       meta_data, dlen);
   }
   GNUNET_free_non_null (data);
   return md;
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index 3607998e4..ec46b486c 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -218,9 +218,9 @@ GNUNET_CRYPTO_rsa_key_get_public (const struct GNUNET_CRYPTO_RsaPrivateKey
   size = GNUNET_CRYPTO_RSA_KEY_LENGTH - GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH;
   GNUNET_assert (0 ==
                  gcry_mpi_print (GCRYMPI_FMT_USG,
-                                 &pub->
-                                 key[GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH],
-                                 size, &size, skey[1]));
+                                 &pub->key
+                                 [GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH], size,
+                                 &size, skey[1]));
   adjust (&pub->key[GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH], size,
           GNUNET_CRYPTO_RSA_KEY_LENGTH -
           GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH);
diff --git a/src/util/disk.h b/src/util/disk.h
index b60150f3a..2c128745f 100644
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -37,7 +37,8 @@
  * @param dst_len length of dst
  * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
  */
-int GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle *fh,
-                                       void *dst, size_t dst_len);
+int
+GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle *fh,
+                                   void *dst, size_t dst_len);
 
 #endif /* GNUNET_DISK_H_ */
diff --git a/src/util/getopt.c b/src/util/getopt.c
index db81d1c3d..eb79db757 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -194,7 +194,8 @@ static char *posixly_correct;
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
 
-char *getenv ();
+char *
+getenv ();
 
 static char *
 my_index (str, chr)
@@ -218,7 +219,8 @@ my_index (str, chr)
 #if !defined (__STDC__) || !__STDC__
 /* gcc with -traditional declares the built-in strlen to return int,
    and has done so at least since version 2.4.5. -- rms.  */
-extern int strlen (const char *);
+extern int
+strlen (const char *);
 #endif /* not __STDC__ */
 #endif /* __GNUC__ */
 
@@ -283,7 +285,8 @@ text_set_element (__libc_subinit, store_args_and_env);
    the new indices of the non-options in ARGV after they are moved.  */
 
 #if defined (__STDC__) && __STDC__
-static void exchange (char **);
+static void
+exchange (char **);
 #endif
 
 static void
@@ -370,7 +373,8 @@ exchange (argv)
 /* Initialize the internal data when the first call is made.  */
 
 #if defined (__STDC__) && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
+static const char *
+_getopt_initialize (int, char *const *, const char *);
 #endif
 static const char *
 _getopt_initialize (argc, argv, optstring)
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 21376f94c..b55789c99 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -135,8 +135,9 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
                 pTable->table[dwIfIdx].dwPhysAddrLen);
 
         snprintf (szEntry, 1000, "%s (%s - %I64u)",
-                  pszIfName ? pszIfName : (char *) pTable->table[dwIfIdx].
-                  bDescr, inet_ntop (AF_INET, &dwIP, dst, INET_ADDRSTRLEN),
+                  pszIfName ? pszIfName : (char *) pTable->
+                  table[dwIfIdx].bDescr, inet_ntop (AF_INET, &dwIP, dst,
+                                                    INET_ADDRSTRLEN),
                   *((unsigned long long *) bPhysAddr));
         szEntry[1000] = 0;
 
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index d27642a58..55a728ce6 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -63,10 +63,9 @@ parent_control_handler (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n",
               __FUNCTION__, tc->reason);
 #endif
-  if (tc->
-      reason & (GNUNET_SCHEDULER_REASON_SHUTDOWN |
-                GNUNET_SCHEDULER_REASON_TIMEOUT |
-                GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  if (tc->reason &
+      (GNUNET_SCHEDULER_REASON_SHUTDOWN | GNUNET_SCHEDULER_REASON_TIMEOUT |
+       GNUNET_SCHEDULER_REASON_PREREQ_DONE))
   {
     GNUNET_DISK_npipe_close (control_pipe);
   }
diff --git a/src/util/peer.c b/src/util/peer.c
index 62fa0e2f2..cd5444a19 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -181,8 +181,8 @@ GNUNET_PEER_decrement_rcs (const GNUNET_PEER_Id *ids, unsigned int count)
     {
       GNUNET_break (GNUNET_OK ==
                     GNUNET_CONTAINER_multihashmap_remove (map,
-                                                          &table[id].id.
-                                                          hashPubKey,
+                                                          &table[id].
+                                                          id.hashPubKey,
                                                           (void *) (long) id));
       table[id].pid = free_list_start;
       free_list_start = id;
@@ -210,8 +210,8 @@ GNUNET_PEER_change_rc (GNUNET_PEER_Id id, int delta)
   {
     GNUNET_break (GNUNET_OK ==
                   GNUNET_CONTAINER_multihashmap_remove (map,
-                                                        &table[id].id.
-                                                        hashPubKey,
+                                                        &table[id].
+                                                        id.hashPubKey,
                                                         (void *) (long) id));
     table[id].pid = free_list_start;
     free_list_start = id;
diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c
index 689781835..d883776b4 100644
--- a/src/util/perf_crypto_hash.c
+++ b/src/util/perf_crypto_hash.c
@@ -58,12 +58,12 @@ main (int argc, char *argv[])
   start = GNUNET_TIME_absolute_get ();
   perfHash ();
   printf ("Hash perf took %llu ms\n",
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value);
   GAUGER ("UTIL", "Cryptographic hashing",
           1024 * 64 * 1024 / (1 +
-                              GNUNET_TIME_absolute_get_duration (start).
-                              rel_value), "kb/s");
+                              GNUNET_TIME_absolute_get_duration
+                              (start).rel_value), "kb/s");
   return 0;
 }
 
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 3aa8bff9c..3607ce67f 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -318,7 +318,8 @@ no_resolve (const struct sockaddr *sa, socklen_t salen)
 /**
  * Adjust exponential back-off and reconnect to the service.
  */
-static void reconnect ();
+static void
+reconnect ();
 
 
 /**
@@ -326,7 +327,8 @@ static void reconnect ();
  *
  * @param h handle to the resolver
  */
-static void process_requests ();
+static void
+process_requests ();
 
 
 /**
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 844531b37..52824d8b3 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -656,9 +656,9 @@ run_ready (struct GNUNET_NETWORK_FDSet *rs, struct GNUNET_NETWORK_FDSet *ws)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Task %llu took %llums to be scheduled\n", pos->id,
-                  (unsigned long long) GNUNET_TIME_absolute_get_duration (pos->
-                                                                          start_time).
-                  rel_value);
+                  (unsigned long long)
+                  GNUNET_TIME_absolute_get_duration
+                  (pos->start_time).rel_value);
     }
 #endif
     tc.reason = pos->reason;
diff --git a/src/util/server.c b/src/util/server.c
index 504391bc7..31d298e3a 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -611,9 +611,9 @@ warn_no_receive_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                 _
                 ("Processing code for message of type %u did not call GNUNET_SERVER_receive_done after %llums\n"),
                 (unsigned int) client->warn_type,
-                (unsigned long long) GNUNET_TIME_absolute_get_duration (client->
-                                                                        warn_start).
-                rel_value);
+                (unsigned long long)
+                GNUNET_TIME_absolute_get_duration
+                (client->warn_start).rel_value);
 }
 
 
@@ -730,9 +730,9 @@ GNUNET_SERVER_inject (struct GNUNET_SERVER_Handle *server,
  * @param addrlen length of addr
  * @param errCode code indicating errors receiving, 0 for success
  */
-static void process_incoming (void *cls, const void *buf, size_t available,
-                              const struct sockaddr *addr, socklen_t addrlen,
-                              int errCode);
+static void
+process_incoming (void *cls, const void *buf, size_t available,
+                  const struct sockaddr *addr, socklen_t addrlen, int errCode);
 
 
 /**
diff --git a/src/util/server_nc.c b/src/util/server_nc.c
index a1cb43f00..a5ee7e0d6 100644
--- a/src/util/server_nc.c
+++ b/src/util/server_nc.c
@@ -381,8 +381,8 @@ do_unicast (struct GNUNET_SERVER_NotificationContext *nc,
   if (client->th == NULL)
     client->th =
         GNUNET_SERVER_notify_transmit_ready (client->client,
-                                             ntohs (client->pending_head->msg->
-                                                    size),
+                                             ntohs (client->pending_head->
+                                                    msg->size),
                                              GNUNET_TIME_UNIT_FOREVER_REL,
                                              &transmit_message, client);
 }
diff --git a/src/util/test_crypto_ksk.c b/src/util/test_crypto_ksk.c
index d4340f3ea..2789f5edb 100644
--- a/src/util/test_crypto_ksk.c
+++ b/src/util/test_crypto_ksk.c
@@ -168,8 +168,8 @@ testEncryptDecrypt (struct GNUNET_CRYPTO_RsaPrivateKey *hostkey)
     }
   }
   printf ("%d RSA encrypt/decrypt operations %llums (%d failures)\n", ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value, ok);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value, ok);
   if (ok == 0)
     return GNUNET_OK;
   else
@@ -218,8 +218,8 @@ testSignVerify (struct GNUNET_CRYPTO_RsaPrivateKey *hostkey)
     }
   }
   printf ("%d RSA sign/verify operations %llums\n", ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value);
   return ok;
 }
 
diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c
index bf058d285..f26a76a38 100644
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -82,8 +82,8 @@ testEncryptDecrypt ()
     }
   }
   printf ("%d RSA encrypt/decrypt operations %llums (%d failures)\n", ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value, ok);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value, ok);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   if (ok == 0)
     return GNUNET_OK;
@@ -121,8 +121,8 @@ testEncryptPerformance ()
     }
   }
   printf ("%d RSA encrypt operations %llu ms (%d failures)\n", ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value, ok);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value, ok);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   if (ok != 0)
     return GNUNET_SYSERR;
@@ -178,8 +178,8 @@ testEncryptDecryptSK ()
     }
   }
   printf ("%d RSA encrypt/decrypt SK operations %llums (%d failures)\n", ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value, ok);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value, ok);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   if (ok != 0)
     return GNUNET_SYSERR;
@@ -232,8 +232,8 @@ testSignVerify ()
     }
   }
   printf ("%d RSA sign/verify operations %llums\n", ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   return ok;
 }
@@ -268,8 +268,8 @@ testSignPerformance ()
     }
   }
   printf ("%d RSA sign operations %llu ms\n", ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          rel_value);
+          (unsigned long long)
+          GNUNET_TIME_absolute_get_duration (start).rel_value);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   return ok;
 }
diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c
index 583a5fb82..315f97d97 100644
--- a/src/util/test_os_network.c
+++ b/src/util/test_os_network.c
@@ -45,9 +45,9 @@ proc (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
 
   inet_ntop (addr->sa_family,
              (addr->sa_family ==
-              AF_INET) ? (void *) &((struct sockaddr_in *) addr)->
-             sin_addr : (void *) &((struct sockaddr_in6 *) addr)->sin6_addr,
-             buf, sizeof (buf));
+              AF_INET) ? (void *) &((struct sockaddr_in *) addr)->sin_addr
+             : (void *) &((struct sockaddr_in6 *) addr)->sin6_addr, buf,
+             sizeof (buf));
   if ((0 == strcmp ("::1", buf)) || (0 == strcmp ("127.0.0.1", buf)))
     *ok = 0;
   return GNUNET_OK;
diff --git a/src/util/test_time.c b/src/util/test_time.c
index 6a05b698c..788884fcc 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -108,8 +108,8 @@ check ()
   GNUNET_assert (GNUNET_TIME_absolute_get_difference (future, now).rel_value ==
                  0);
 
-  GNUNET_assert (GNUNET_TIME_absolute_get_difference (zero, forever).
-                 rel_value == forever.abs_value);
+  GNUNET_assert (GNUNET_TIME_absolute_get_difference (zero, forever).rel_value
+                 == forever.abs_value);
 
   past.abs_value = now.abs_value - 1000000;
   rel = GNUNET_TIME_absolute_get_duration (future);
@@ -153,8 +153,7 @@ check ()
 
   GNUNET_assert (forever.abs_value ==
                  GNUNET_TIME_absolute_subtract (forever,
-                                                GNUNET_TIME_UNIT_MINUTES).
-                 abs_value);
+                                                GNUNET_TIME_UNIT_MINUTES).abs_value);
   /*check absolute subtract */
   now.abs_value = 50000;
   rel.rel_value = 100000;