indentation

7 files changed, 66 insertions, 93 deletions

diff --git a/src/block/block.c b/src/block/block.c
index bdef55aa3..ac466337c 100644
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -72,8 +72,8 @@ struct GNUNET_BLOCK_Context
  * @param hc where to store the result.
  */
 void
-GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in,
-                          uint32_t mingle_number, GNUNET_HashCode * hc)
+GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, uint32_t mingle_number,
+                          GNUNET_HashCode * hc)
 {
   GNUNET_HashCode m;
 
@@ -105,8 +105,8 @@ GNUNET_BLOCK_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg)
   if (GNUNET_OK ==
       GNUNET_CONFIGURATION_get_value_string (cfg, "block", "PLUGINS", &plugs))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("Loading block plugins `%s'\n"), plugs);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading block plugins `%s'\n"),
+                plugs);
     pos = strtok (plugs, " ");
     while (pos != NULL)
     {
@@ -212,18 +212,16 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
                        enum GNUNET_BLOCK_Type type,
                        const GNUNET_HashCode * query,
                        struct GNUNET_CONTAINER_BloomFilter **bf,
-                       int32_t bf_mutator,
-                       const void *xquery,
-                       size_t xquery_size,
-                       const void *reply_block, size_t reply_block_size)
+                       int32_t bf_mutator, const void *xquery,
+                       size_t xquery_size, const void *reply_block,
+                       size_t reply_block_size)
 {
   struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type);
 
   if (plugin == NULL)
     return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
-  return plugin->evaluate (plugin->cls,
-                           type, query, bf, bf_mutator,
-                           xquery, xquery_size, reply_block, reply_block_size);
+  return plugin->evaluate (plugin->cls, type, query, bf, bf_mutator, xquery,
+                           xquery_size, reply_block, reply_block_size);
 }
 
 
@@ -240,8 +238,7 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
  */
 int
 GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx,
-                      enum GNUNET_BLOCK_Type type,
-                      const void *block,
+                      enum GNUNET_BLOCK_Type type, const void *block,
                       size_t block_size, GNUNET_HashCode * key)
 {
   struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type);
diff --git a/src/block/plugin_block_dht.c b/src/block/plugin_block_dht.c
index 1fe51e1a3..614628a40 100644
--- a/src/block/plugin_block_dht.c
+++ b/src/block/plugin_block_dht.c
@@ -49,14 +49,12 @@
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_dht_evaluate (void *cls,
-                           enum GNUNET_BLOCK_Type type,
+block_plugin_dht_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                            const GNUNET_HashCode * query,
                            struct GNUNET_CONTAINER_BloomFilter **bf,
-                           int32_t bf_mutator,
-                           const void *xquery,
-                           size_t xquery_size,
-                           const void *reply_block, size_t reply_block_size)
+                           int32_t bf_mutator, const void *xquery,
+                           size_t xquery_size, const void *reply_block,
+                           size_t reply_block_size)
 {
   switch (type)
   {
@@ -85,10 +83,9 @@ block_plugin_dht_evaluate (void *cls,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_dht_get_key (void *cls,
-                          enum GNUNET_BLOCK_Type type,
-                          const void *block,
-                          size_t block_size, GNUNET_HashCode * key)
+block_plugin_dht_get_key (void *cls, enum GNUNET_BLOCK_Type type,
+                          const void *block, size_t block_size,
+                          GNUNET_HashCode * key)
 {
   const struct GNUNET_MessageHeader *msg;
   const struct GNUNET_HELLO_Message *hello;
@@ -98,16 +95,14 @@ block_plugin_dht_get_key (void *cls,
     return GNUNET_SYSERR;
   if (block_size < sizeof (struct GNUNET_MessageHeader))
   {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                     "block-dht",
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht",
                      _("Block not of type %u\n"), GNUNET_BLOCK_TYPE_DHT_HELLO);
     return GNUNET_NO;
   }
   msg = block;
   if (block_size != ntohs (msg->size))
   {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                     "block-dht",
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht",
                      _("Size mismatch for block\n"),
                      GNUNET_BLOCK_TYPE_DHT_HELLO);
     return GNUNET_NO;
@@ -116,8 +111,7 @@ block_plugin_dht_get_key (void *cls,
   pid = (struct GNUNET_PeerIdentity *) key;
   if (GNUNET_OK != GNUNET_HELLO_get_id (hello, pid))
   {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                     "block-dht",
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht",
                      _("Block of type %u is malformed\n"),
                      GNUNET_BLOCK_TYPE_DHT_HELLO);
     return GNUNET_NO;
diff --git a/src/block/plugin_block_dns.c b/src/block/plugin_block_dns.c
index 0cf8c50e9..e20370685 100644
--- a/src/block/plugin_block_dns.c
+++ b/src/block/plugin_block_dns.c
@@ -47,14 +47,12 @@
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_dns_evaluate (void *cls,
-                           enum GNUNET_BLOCK_Type type,
+block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                            const GNUNET_HashCode * query,
                            struct GNUNET_CONTAINER_BloomFilter **bf,
-                           int32_t bf_mutator,
-                           const void *xquery,
-                           size_t xquery_size,
-                           const void *reply_block, size_t reply_block_size)
+                           int32_t bf_mutator, const void *xquery,
+                           size_t xquery_size, const void *reply_block,
+                           size_t reply_block_size)
 {
   switch (type)
   {
@@ -123,10 +121,9 @@ block_plugin_dns_evaluate (void *cls,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_dns_get_key (void *cls,
-                          enum GNUNET_BLOCK_Type type,
-                          const void *block,
-                          size_t block_size, GNUNET_HashCode * key)
+block_plugin_dns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
+                          const void *block, size_t block_size,
+                          GNUNET_HashCode * key)
 {
   if (type != GNUNET_BLOCK_TYPE_DNS)
     return GNUNET_SYSERR;
diff --git a/src/block/plugin_block_fs.c b/src/block/plugin_block_fs.c
index db8e59991..627f21a10 100644
--- a/src/block/plugin_block_fs.c
+++ b/src/block/plugin_block_fs.c
@@ -56,14 +56,12 @@
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_fs_evaluate (void *cls,
-                          enum GNUNET_BLOCK_Type type,
+block_plugin_fs_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                           const GNUNET_HashCode * query,
                           struct GNUNET_CONTAINER_BloomFilter **bf,
-                          int32_t bf_mutator,
-                          const void *xquery,
-                          size_t xquery_size,
-                          const void *reply_block, size_t reply_block_size)
+                          int32_t bf_mutator, const void *xquery,
+                          size_t xquery_size, const void *reply_block,
+                          size_t reply_block_size)
 {
   const struct SBlock *sb;
   GNUNET_HashCode chash;
@@ -125,8 +123,7 @@ block_plugin_fs_evaluate (void *cls,
                         &sh);
     if (0 != memcmp (nsid, &sh, sizeof (GNUNET_HashCode)))
     {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
-                       "block-fs",
+      GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "block-fs",
                        _
                        ("Reply mismatched in terms of namespace.  Discarded.\n"));
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
@@ -162,10 +159,9 @@ block_plugin_fs_evaluate (void *cls,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_fs_get_key (void *cls,
-                         enum GNUNET_BLOCK_Type type,
-                         const void *block,
-                         size_t block_size, GNUNET_HashCode * key)
+block_plugin_fs_get_key (void *cls, enum GNUNET_BLOCK_Type type,
+                         const void *block, size_t block_size,
+                         GNUNET_HashCode * key)
 {
   const struct KBlock *kb;
   const struct SBlock *sb;
@@ -185,9 +181,9 @@ block_plugin_fs_get_key (void *cls,
     }
     kb = block;
     if (block_size - sizeof (struct KBlock) !=
-        ntohl (kb->purpose.size)
-        - sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)
-        - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))
+        ntohl (kb->purpose.size) -
+        sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) -
+        sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))
     {
       GNUNET_break_op (0);
       return GNUNET_NO;
@@ -236,9 +232,9 @@ block_plugin_fs_get_key (void *cls,
     }
     nb = block;
     if (block_size - sizeof (struct NBlock) !=
-        ntohl (nb->ns_purpose.size)
-        - sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)
-        - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))
+        ntohl (nb->ns_purpose.size) -
+        sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) -
+        sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))
     {
       GNUNET_break_op (0);
       return GNUNET_NO;
@@ -252,16 +248,16 @@ block_plugin_fs_get_key (void *cls,
     }
     if (GNUNET_OK !=
         GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK_KSIG,
-                                  &nb->ksk_purpose,
-                                  &nb->ksk_signature, &nb->keyspace))
+                                  &nb->ksk_purpose, &nb->ksk_signature,
+                                  &nb->keyspace))
     {
       GNUNET_break_op (0);
       return GNUNET_NO;
     }
     if (GNUNET_OK !=
         GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK,
-                                  &nb->ns_purpose,
-                                  &nb->ns_signature, &nb->subspace))
+                                  &nb->ns_purpose, &nb->ns_signature,
+                                  &nb->subspace))
     {
       GNUNET_break_op (0);
       return GNUNET_NO;
diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c
index 9eb84ac4b..7ce3004eb 100644
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -46,14 +46,11 @@
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_template_evaluate (void *cls,
-                                enum GNUNET_BLOCK_Type type,
+block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                                 const GNUNET_HashCode * query,
                                 struct GNUNET_CONTAINER_BloomFilter **bf,
-                                int32_t bf_mutator,
-                                const void *xquery,
-                                size_t xquery_size,
-                                const void *reply_block,
+                                int32_t bf_mutator, const void *xquery,
+                                size_t xquery_size, const void *reply_block,
                                 size_t reply_block_size)
 {
   return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
@@ -72,10 +69,9 @@ block_plugin_template_evaluate (void *cls,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_template_get_key (void *cls,
-                               enum GNUNET_BLOCK_Type type,
-                               const void *block,
-                               size_t block_size, GNUNET_HashCode * key)
+block_plugin_template_get_key (void *cls, enum GNUNET_BLOCK_Type type,
+                               const void *block, size_t block_size,
+                               GNUNET_HashCode * key)
 {
   return GNUNET_SYSERR;
 }
diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c
index b5c03eea9..6fa535afe 100644
--- a/src/block/plugin_block_test.c
+++ b/src/block/plugin_block_test.c
@@ -53,14 +53,12 @@
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_test_evaluate (void *cls,
-                            enum GNUNET_BLOCK_Type type,
+block_plugin_test_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                             const GNUNET_HashCode * query,
                             struct GNUNET_CONTAINER_BloomFilter **bf,
-                            int32_t bf_mutator,
-                            const void *xquery,
-                            size_t xquery_size,
-                            const void *reply_block, size_t reply_block_size)
+                            int32_t bf_mutator, const void *xquery,
+                            size_t xquery_size, const void *reply_block,
+                            size_t reply_block_size)
 {
   GNUNET_HashCode chash;
   GNUNET_HashCode mhash;
@@ -100,10 +98,9 @@ block_plugin_test_evaluate (void *cls,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_test_get_key (void *cls,
-                           enum GNUNET_BLOCK_Type type,
-                           const void *block,
-                           size_t block_size, GNUNET_HashCode * key)
+block_plugin_test_get_key (void *cls, enum GNUNET_BLOCK_Type type,
+                           const void *block, size_t block_size,
+                           GNUNET_HashCode * key)
 {
   /* always fails since there is no fixed relationship between
    * keys and values for test values */
diff --git a/src/block/test_block.c b/src/block/test_block.c
index 4bfd63ceb..f7a3422e0 100644
--- a/src/block/test_block.c
+++ b/src/block/test_block.c
@@ -37,25 +37,21 @@ test_fs (struct GNUNET_BLOCK_Context *ctx)
 
   memset (block, 1, sizeof (block));
   if (GNUNET_OK !=
-      GNUNET_BLOCK_get_key (ctx,
-                            GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                            block, sizeof (block), &key))
+      GNUNET_BLOCK_get_key (ctx, GNUNET_BLOCK_TYPE_FS_DBLOCK, block,
+                            sizeof (block), &key))
     return 1;
   if (GNUNET_BLOCK_EVALUATION_OK_LAST !=
-      GNUNET_BLOCK_evaluate (ctx,
-                             GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                             &key, NULL, 0, NULL, 0, block, sizeof (block)))
+      GNUNET_BLOCK_evaluate (ctx, GNUNET_BLOCK_TYPE_FS_DBLOCK, &key, NULL, 0,
+                             NULL, 0, block, sizeof (block)))
     return 2;
   if (GNUNET_BLOCK_EVALUATION_REQUEST_VALID !=
-      GNUNET_BLOCK_evaluate (ctx,
-                             GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                             &key, NULL, 0, NULL, 0, NULL, 0))
+      GNUNET_BLOCK_evaluate (ctx, GNUNET_BLOCK_TYPE_FS_DBLOCK, &key, NULL, 0,
+                             NULL, 0, NULL, 0))
     return 4;
   GNUNET_log_skip (1, GNUNET_NO);
   if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID !=
-      GNUNET_BLOCK_evaluate (ctx,
-                             GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                             &key, NULL, 0, "bogus", 5, NULL, 0))
+      GNUNET_BLOCK_evaluate (ctx, GNUNET_BLOCK_TYPE_FS_DBLOCK, &key, NULL, 0,
+                             "bogus", 5, NULL, 0))
     return 8;
   GNUNET_log_skip (0, GNUNET_YES);
   return 0;