1 files changed, 89 insertions, 87 deletions

diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 71cd78a8e..f4f5f906c 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -56,37 +56,38 @@
  *         by this @a type of block (this is not an error)
  */
 static struct GNUNET_BLOCK_Group *
-block_plugin_gns_create_group(void *cls,
-                              enum GNUNET_BLOCK_Type type,
-                              uint32_t nonce,
-                              const void *raw_data,
-                              size_t raw_data_size,
-                              va_list va)
+block_plugin_gns_create_group (void *cls,
+                               enum GNUNET_BLOCK_Type type,
+                               uint32_t nonce,
+                               const void *raw_data,
+                               size_t raw_data_size,
+                               va_list va)
 {
   unsigned int bf_size;
   const char *guard;
 
-  guard = va_arg(va, const char *);
-  if (0 == strcmp(guard,
-                  "seen-set-size"))
-    bf_size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size(va_arg(va, unsigned int),
-                                                          BLOOMFILTER_K);
-  else if (0 == strcmp(guard,
-                       "filter-size"))
-    bf_size = va_arg(va, unsigned int);
+  guard = va_arg (va, const char *);
+  if (0 == strcmp (guard,
+                   "seen-set-size"))
+    bf_size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned
+                                                                   int),
+                                                           BLOOMFILTER_K);
+  else if (0 == strcmp (guard,
+                        "filter-size"))
+    bf_size = va_arg (va, unsigned int);
   else
-    {
-      GNUNET_break(0);
-      bf_size = GNS_BF_SIZE;
-    }
-  GNUNET_break(NULL == va_arg(va, const char *));
-  return GNUNET_BLOCK_GROUP_bf_create(cls,
-                                      bf_size,
-                                      BLOOMFILTER_K,
-                                      type,
-                                      nonce,
-                                      raw_data,
-                                      raw_data_size);
+  {
+    GNUNET_break (0);
+    bf_size = GNS_BF_SIZE;
+  }
+  GNUNET_break (NULL == va_arg (va, const char *));
+  return GNUNET_BLOCK_GROUP_bf_create (cls,
+                                       bf_size,
+                                       BLOOMFILTER_K,
+                                       type,
+                                       nonce,
+                                       raw_data,
+                                       raw_data_size);
 }
 
 
@@ -110,16 +111,16 @@ block_plugin_gns_create_group(void *cls,
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_gns_evaluate(void *cls,
-                          struct GNUNET_BLOCK_Context *ctx,
-                          enum GNUNET_BLOCK_Type type,
-                          struct GNUNET_BLOCK_Group *bg,
-                          enum GNUNET_BLOCK_EvaluationOptions eo,
-                          const struct GNUNET_HashCode *query,
-                          const void *xquery,
-                          size_t xquery_size,
-                          const void *reply_block,
-                          size_t reply_block_size)
+block_plugin_gns_evaluate (void *cls,
+                           struct GNUNET_BLOCK_Context *ctx,
+                           enum GNUNET_BLOCK_Type type,
+                           struct GNUNET_BLOCK_Group *bg,
+                           enum GNUNET_BLOCK_EvaluationOptions eo,
+                           const struct GNUNET_HashCode *query,
+                           const void *xquery,
+                           size_t xquery_size,
+                           const void *reply_block,
+                           size_t reply_block_size)
 {
   const struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_HashCode h;
@@ -128,48 +129,50 @@ block_plugin_gns_evaluate(void *cls,
   if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
     return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
   if (NULL == reply_block)
+  {
+    if (0 != xquery_size)
     {
-      if (0 != xquery_size)
-        {
-          GNUNET_break_op(0);
-          return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
-        }
-      return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+      GNUNET_break_op (0);
+      return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
     }
+    return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+  }
 
   /* this is a reply */
   if (reply_block_size < sizeof(struct GNUNET_GNSRECORD_Block))
-    {
-      GNUNET_break_op(0);
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-    }
+  {
+    GNUNET_break_op (0);
+    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+  }
   block = reply_block;
-  if (ntohl(block->purpose.size) + sizeof(struct GNUNET_CRYPTO_EcdsaSignature) + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) !=
+  if (ntohl (block->purpose.size) + sizeof(struct
+                                           GNUNET_CRYPTO_EcdsaSignature)
+      + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) !=
       reply_block_size)
-    {
-      GNUNET_break_op(0);
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-    }
-  GNUNET_CRYPTO_hash(&block->derived_key,
-                     sizeof(block->derived_key),
-                     &h);
-  if (0 != GNUNET_memcmp(&h, query))
-    {
-      GNUNET_break_op(0);
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-    }
+  {
+    GNUNET_break_op (0);
+    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+  }
+  GNUNET_CRYPTO_hash (&block->derived_key,
+                      sizeof(block->derived_key),
+                      &h);
+  if (0 != GNUNET_memcmp (&h, query))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+  }
   if (GNUNET_OK !=
-      GNUNET_GNSRECORD_block_verify(block))
-    {
-      GNUNET_break_op(0);
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-    }
-  GNUNET_CRYPTO_hash(reply_block,
-                     reply_block_size,
-                     &chash);
+      GNUNET_GNSRECORD_block_verify (block))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+  }
+  GNUNET_CRYPTO_hash (reply_block,
+                      reply_block_size,
+                      &chash);
   if (GNUNET_YES ==
-      GNUNET_BLOCK_GROUP_bf_test_and_set(bg,
-                                         &chash))
+      GNUNET_BLOCK_GROUP_bf_test_and_set (bg,
+                                          &chash))
     return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
   return GNUNET_BLOCK_EVALUATION_OK_MORE;
 }
@@ -187,25 +190,25 @@ block_plugin_gns_evaluate(void *cls,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_gns_get_key(void *cls,
-                         enum GNUNET_BLOCK_Type type,
-                         const void *reply_block,
-                         size_t reply_block_size,
-                         struct GNUNET_HashCode *key)
+block_plugin_gns_get_key (void *cls,
+                          enum GNUNET_BLOCK_Type type,
+                          const void *reply_block,
+                          size_t reply_block_size,
+                          struct GNUNET_HashCode *key)
 {
   const struct GNUNET_GNSRECORD_Block *block;
 
   if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
     return GNUNET_SYSERR;
   if (reply_block_size < sizeof(struct GNUNET_GNSRECORD_Block))
-    {
-      GNUNET_break_op(0);
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-    }
+  {
+    GNUNET_break_op (0);
+    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+  }
   block = reply_block;
-  GNUNET_CRYPTO_hash(&block->derived_key,
-                     sizeof(block->derived_key),
-                     key);
+  GNUNET_CRYPTO_hash (&block->derived_key,
+                      sizeof(block->derived_key),
+                      key);
   return GNUNET_OK;
 }
 
@@ -214,16 +217,15 @@ block_plugin_gns_get_key(void *cls,
  * Entry point for the plugin.
  */
 void *
-libgnunet_plugin_block_gns_init(void *cls)
+libgnunet_plugin_block_gns_init (void *cls)
 {
-  static enum GNUNET_BLOCK_Type types[] =
-  {
+  static enum GNUNET_BLOCK_Type types[] = {
     GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
     GNUNET_BLOCK_TYPE_ANY       /* end of list */
   };
   struct GNUNET_BLOCK_PluginFunctions *api;
 
-  api = GNUNET_new(struct GNUNET_BLOCK_PluginFunctions);
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_gns_evaluate;
   api->get_key = &block_plugin_gns_get_key;
   api->create_group = &block_plugin_gns_create_group;
@@ -236,11 +238,11 @@ libgnunet_plugin_block_gns_init(void *cls)
  * Exit point from the plugin.
  */
 void *
-libgnunet_plugin_block_gns_done(void *cls)
+libgnunet_plugin_block_gns_done (void *cls)
 {
   struct GNUNET_BLOCK_PluginFunctions *api = cls;
 
-  GNUNET_free(api);
+  GNUNET_free (api);
   return NULL;
 }