1 files changed, 303 insertions, 297 deletions

diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c
index 75a340014..2fedc1f19 100644
--- a/src/my/my_result_helper.c
+++ b/src/my/my_result_helper.c
@@ -1,22 +1,22 @@
- /*
-  This file is part of GNUnet
-  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
-
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
-*/
+/*
+   This file is part of GNUnet
+   Copyright (C) 2014, 2015, 2016 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    SPDX-License-Identifier: AGPL3.0-or-later
+ */
 /**
  * @file my/my_result_helper.c
  * @brief functions to extract result values
@@ -41,11 +41,11 @@
  *   #GNUNET_SYSERR if a result was invalid
  */
 static int
-pre_extract_varsize_blob (void *cls,
-                          struct GNUNET_MY_ResultSpec *rs,
-                          MYSQL_STMT *stmt,
-                          unsigned int column,
-                          MYSQL_BIND *results)
+pre_extract_varsize_blob(void *cls,
+                         struct GNUNET_MY_ResultSpec *rs,
+                         MYSQL_STMT *stmt,
+                         unsigned int column,
+                         MYSQL_BIND *results)
 {
   results[0].buffer = NULL;
   results[0].buffer_length = 0;
@@ -70,39 +70,39 @@ pre_extract_varsize_blob (void *cls,
  *   #GNUNET_SYSERR if a result was invalid
  */
 static int
-post_extract_varsize_blob (void *cls,
-                           struct GNUNET_MY_ResultSpec *rs,
-                           MYSQL_STMT *stmt,
-                           unsigned int column,
-                           MYSQL_BIND *results)
+post_extract_varsize_blob(void *cls,
+                          struct GNUNET_MY_ResultSpec *rs,
+                          MYSQL_STMT *stmt,
+                          unsigned int column,
+                          MYSQL_BIND *results)
 {
   void *buf;
   size_t size;
 
   if (*results->is_null)
     return GNUNET_SYSERR;
-  size = (size_t) rs->mysql_bind_output_length;
+  size = (size_t)rs->mysql_bind_output_length;
 
   if (rs->mysql_bind_output_length != size)
     return GNUNET_SYSERR; /* 'unsigned long' does not fit in size_t!? */
 
-  buf = GNUNET_malloc (size);
+  buf = GNUNET_malloc(size);
 
   results[0].buffer = buf;
   results[0].buffer_length = size;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
 
   if (0 !=
-      mysql_stmt_fetch_column (stmt,
-                               results,
-                               column,
-                               0))
-  {
-    GNUNET_free (buf);
-    return GNUNET_SYSERR;
-  }
-
-  *(void **) rs->dst = buf;
+      mysql_stmt_fetch_column(stmt,
+                              results,
+                              column,
+                              0))
+    {
+      GNUNET_free(buf);
+      return GNUNET_SYSERR;
+    }
+
+  *(void **)rs->dst = buf;
   *rs->result_size = size;
 
   return GNUNET_OK;
@@ -116,16 +116,16 @@ post_extract_varsize_blob (void *cls,
  * @param[in,out] rs
  */
 static void
-cleanup_varsize_blob (void *cls,
-                      struct GNUNET_MY_ResultSpec *rs)
+cleanup_varsize_blob(void *cls,
+                     struct GNUNET_MY_ResultSpec *rs)
 {
   void **ptr = (void **)rs->dst;
 
   if (NULL != *ptr)
-  {
-    GNUNET_free (*ptr);
-    *ptr = NULL;
-  }
+    {
+      GNUNET_free(*ptr);
+      *ptr = NULL;
+    }
 }
 
 
@@ -137,7 +137,7 @@ cleanup_varsize_blob (void *cls,
  * @return array entru for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_variable_size (void **dst,
+GNUNET_MY_result_spec_variable_size(void **dst,
                                     size_t *ptr_size)
 {
   struct GNUNET_MY_ResultSpec res =
@@ -145,7 +145,7 @@ GNUNET_MY_result_spec_variable_size (void **dst,
     .pre_conv = &pre_extract_varsize_blob,
     .post_conv = &post_extract_varsize_blob,
     .cleaner = &cleanup_varsize_blob,
-    .dst =  (void *)(dst),
+    .dst = (void *)(dst),
     .result_size = ptr_size,
     .num_fields = 1
   };
@@ -167,11 +167,11 @@ GNUNET_MY_result_spec_variable_size (void **dst,
  *  #GNUNET_SYSERR if a result was invalid(non-existing field or NULL)
  */
 static int
-pre_extract_fixed_blob (void *cls,
-                        struct GNUNET_MY_ResultSpec *rs,
-                        MYSQL_STMT *stmt,
-                        unsigned int column,
-                        MYSQL_BIND *results)
+pre_extract_fixed_blob(void *cls,
+                       struct GNUNET_MY_ResultSpec *rs,
+                       MYSQL_STMT *stmt,
+                       unsigned int column,
+                       MYSQL_BIND *results)
 {
   results[0].buffer = rs->dst;
   results[0].buffer_length = rs->dst_size;
@@ -198,11 +198,11 @@ pre_extract_fixed_blob (void *cls,
  *  #GNUNET_SYSERR if a result was invalid(non-existing field or NULL)
  */
 static int
-post_extract_fixed_blob (void *cls,
-                         struct GNUNET_MY_ResultSpec *rs,
-                         MYSQL_STMT *stmt,
-                         unsigned int column,
-                         MYSQL_BIND *results)
+post_extract_fixed_blob(void *cls,
+                        struct GNUNET_MY_ResultSpec *rs,
+                        MYSQL_STMT *stmt,
+                        unsigned int column,
+                        MYSQL_BIND *results)
 {
   if (*results->is_null)
     return GNUNET_SYSERR;
@@ -221,8 +221,8 @@ post_extract_fixed_blob (void *cls,
  * @return array entry for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_fixed_size (void *ptr,
-                                  size_t ptr_size)
+GNUNET_MY_result_spec_fixed_size(void *ptr,
+                                 size_t ptr_size)
 {
   struct GNUNET_MY_ResultSpec res =
   {
@@ -239,23 +239,23 @@ GNUNET_MY_result_spec_fixed_size (void *ptr,
 
 
 /**
-  * Extract data from a Mysql database @a result at row @a row
-  *
-  * @param cls closure
-  * @param[in,out] rs
-  * @param stmt the mysql statement that is being run
-  * @param column the column that is being processed
-  * @param[out] results
-  * @return
-  *   #GNUNET_OK if all results could be extracted
-  *   #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
-  */
+ * Extract data from a Mysql database @a result at row @a row
+ *
+ * @param cls closure
+ * @param[in,out] rs
+ * @param stmt the mysql statement that is being run
+ * @param column the column that is being processed
+ * @param[out] results
+ * @return
+ *   #GNUNET_OK if all results could be extracted
+ *   #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
 static int
-pre_extract_rsa_public_key (void *cls,
-                            struct GNUNET_MY_ResultSpec *rs,
-                            MYSQL_STMT *stmt,
-                            unsigned int column,
-                            MYSQL_BIND *results)
+pre_extract_rsa_public_key(void *cls,
+                           struct GNUNET_MY_ResultSpec *rs,
+                           MYSQL_STMT *stmt,
+                           unsigned int column,
+                           MYSQL_BIND *results)
 {
   results[0].buffer = NULL;
   results[0].buffer_length = 0;
@@ -269,24 +269,24 @@ pre_extract_rsa_public_key (void *cls,
 
 
 /**
-  * Check size of extracted fixed size data from a Mysql database @a
-  * result at row @a row
-  *
-  * @param cls closure
-  * @param[in,out] rs
-  * @param stmt the mysql statement that is being run
-  * @param column the column that is being processed
-  * @param[out] results
-  * @return
-  *   #GNUNET_OK if all results could be extracted
-  *   #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
-  */
+ * Check size of extracted fixed size data from a Mysql database @a
+ * result at row @a row
+ *
+ * @param cls closure
+ * @param[in,out] rs
+ * @param stmt the mysql statement that is being run
+ * @param column the column that is being processed
+ * @param[out] results
+ * @return
+ *   #GNUNET_OK if all results could be extracted
+ *   #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
 static int
-post_extract_rsa_public_key  (void *cls,
-                              struct GNUNET_MY_ResultSpec *rs,
-                              MYSQL_STMT *stmt,
-                              unsigned int column,
-                              MYSQL_BIND *results)
+post_extract_rsa_public_key(void *cls,
+                            struct GNUNET_MY_ResultSpec *rs,
+                            MYSQL_STMT *stmt,
+                            unsigned int column,
+                            MYSQL_BIND *results)
 
 {
   struct GNUNET_CRYPTO_RsaPublicKey **pk = rs->dst;
@@ -295,34 +295,34 @@ post_extract_rsa_public_key  (void *cls,
 
   if (*results->is_null)
     return GNUNET_SYSERR;
-  size = (size_t) rs->mysql_bind_output_length;
+  size = (size_t)rs->mysql_bind_output_length;
 
   if (rs->mysql_bind_output_length != size)
     return GNUNET_SYSERR; /* 'unsigned long' does not fit in size_t!? */
-  buf = GNUNET_malloc (size);
+  buf = GNUNET_malloc(size);
 
   results[0].buffer = buf;
   results[0].buffer_length = size;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
   if (0 !=
-      mysql_stmt_fetch_column (stmt,
-                               results,
-                               column,
-                               0))
-  {
-    GNUNET_free (buf);
-    return GNUNET_SYSERR;
-  }
-
-  *pk = GNUNET_CRYPTO_rsa_public_key_decode (buf,
-                                             size);
-  GNUNET_free (buf);
+      mysql_stmt_fetch_column(stmt,
+                              results,
+                              column,
+                              0))
+    {
+      GNUNET_free(buf);
+      return GNUNET_SYSERR;
+    }
+
+  *pk = GNUNET_CRYPTO_rsa_public_key_decode(buf,
+                                            size);
+  GNUNET_free(buf);
   if (NULL == *pk)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Results contains bogus public key value (fail to decode)\n");
-    return GNUNET_SYSERR;
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Results contains bogus public key value (fail to decode)\n");
+      return GNUNET_SYSERR;
+    }
 
   return GNUNET_OK;
 }
@@ -336,34 +336,34 @@ post_extract_rsa_public_key  (void *cls,
  * @param rs result data to clean up
  */
 static void
-clean_rsa_public_key (void *cls,
-                      struct GNUNET_MY_ResultSpec *rs)
+clean_rsa_public_key(void *cls,
+                     struct GNUNET_MY_ResultSpec *rs)
 {
   struct GNUNET_CRYPTO_RsaPublicKey **pk = rs->dst;
 
   if (NULL != *pk)
-  {
-    GNUNET_CRYPTO_rsa_public_key_free (*pk);
-    *pk = NULL;
-  }
+    {
+      GNUNET_CRYPTO_rsa_public_key_free(*pk);
+      *pk = NULL;
+    }
 }
 
 
 /**
-  * RSA public key expected
-  *
-  * @param name name of the field in the table
-  * @param[out] rsa where to store the result
-  * @return array entry for the result specification to use
-  */
+ * RSA public key expected
+ *
+ * @param name name of the field in the table
+ * @param[out] rsa where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_rsa_public_key (struct GNUNET_CRYPTO_RsaPublicKey **rsa)
+GNUNET_MY_result_spec_rsa_public_key(struct GNUNET_CRYPTO_RsaPublicKey **rsa)
 {
   struct GNUNET_MY_ResultSpec res = {
     .pre_conv = &pre_extract_rsa_public_key,
     .post_conv = &post_extract_rsa_public_key,
     .cleaner = &clean_rsa_public_key,
-    .dst = (void *) rsa,
+    .dst = (void *)rsa,
     .dst_size = 0,
     .num_fields = 1
   };
@@ -373,23 +373,23 @@ GNUNET_MY_result_spec_rsa_public_key (struct GNUNET_CRYPTO_RsaPublicKey **rsa)
 
 
 /**
-  * Extract data from a Mysql database @a result at row @a row.
-  *
-  * @param cls closure
-  * @param[in,out] rs
-  * @param stmt the mysql statement that is being run
-  * @param column the column that is being processed
-  * @param[out] results
-  * @return
-  *    #GNUNET_OK if all results could be extracted
-  *    #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
-  */
+ * Extract data from a Mysql database @a result at row @a row.
+ *
+ * @param cls closure
+ * @param[in,out] rs
+ * @param stmt the mysql statement that is being run
+ * @param column the column that is being processed
+ * @param[out] results
+ * @return
+ *    #GNUNET_OK if all results could be extracted
+ *    #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
 static int
-pre_extract_rsa_signature (void *cls,
-                      struct GNUNET_MY_ResultSpec *rs,
-                      MYSQL_STMT *stmt,
-                      unsigned int column,
-                      MYSQL_BIND *results)
+pre_extract_rsa_signature(void *cls,
+                          struct GNUNET_MY_ResultSpec *rs,
+                          MYSQL_STMT *stmt,
+                          unsigned int column,
+                          MYSQL_BIND *results)
 {
   results[0].buffer = 0;
   results[0].buffer_length = 0;
@@ -403,23 +403,23 @@ pre_extract_rsa_signature (void *cls,
 
 
 /**
-  * Extract data from a Mysql database @a result at row @a row.
-  *
-  * @param cls closure
-  * @param[in,out] rs
-  * @param stmt the mysql statement that is being run
-  * @param column the column that is being processed
-  * @param[out] results
-  * @return
-  *    #GNUNET_OK if all results could be extracted
-  *    #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
-  */
+ * Extract data from a Mysql database @a result at row @a row.
+ *
+ * @param cls closure
+ * @param[in,out] rs
+ * @param stmt the mysql statement that is being run
+ * @param column the column that is being processed
+ * @param[out] results
+ * @return
+ *    #GNUNET_OK if all results could be extracted
+ *    #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
 static int
-post_extract_rsa_signature (void *cls,
-                            struct GNUNET_MY_ResultSpec *rs,
-                            MYSQL_STMT *stmt,
-                            unsigned int column,
-                            MYSQL_BIND *results)
+post_extract_rsa_signature(void *cls,
+                           struct GNUNET_MY_ResultSpec *rs,
+                           MYSQL_STMT *stmt,
+                           unsigned int column,
+                           MYSQL_BIND *results)
 {
   struct GNUNET_CRYPTO_RsaSignature **sig = rs->dst;
   void *buf;
@@ -427,34 +427,34 @@ post_extract_rsa_signature (void *cls,
 
   if (*results->is_null)
     return GNUNET_SYSERR;
-  size = (size_t) rs->mysql_bind_output_length;
+  size = (size_t)rs->mysql_bind_output_length;
 
   if (rs->mysql_bind_output_length != size)
     return GNUNET_SYSERR; /* 'unsigned long' does not fit in size_t!? */
-  buf = GNUNET_malloc (size);
+  buf = GNUNET_malloc(size);
 
   results[0].buffer = buf;
   results[0].buffer_length = size;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
   if (0 !=
-      mysql_stmt_fetch_column (stmt,
-                               results,
-                               column,
-                               0))
-  {
-    GNUNET_free (buf);
-    return GNUNET_SYSERR;
-  }
-
-  *sig = GNUNET_CRYPTO_rsa_signature_decode (buf,
-                                             size);
-  GNUNET_free (buf);
+      mysql_stmt_fetch_column(stmt,
+                              results,
+                              column,
+                              0))
+    {
+      GNUNET_free(buf);
+      return GNUNET_SYSERR;
+    }
+
+  *sig = GNUNET_CRYPTO_rsa_signature_decode(buf,
+                                            size);
+  GNUNET_free(buf);
   if (NULL == *sig)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Resuls contains bogus signature value (fails to decode)\n");
-    return GNUNET_SYSERR;
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Resuls contains bogus signature value (fails to decode)\n");
+      return GNUNET_SYSERR;
+    }
   return GNUNET_OK;
 }
 
@@ -467,27 +467,27 @@ post_extract_rsa_signature (void *cls,
  * @param rd result data to clean up
  */
 static void
-clean_rsa_signature (void *cls,
-                     struct GNUNET_MY_ResultSpec *rs)
+clean_rsa_signature(void *cls,
+                    struct GNUNET_MY_ResultSpec *rs)
 {
   struct GNUNET_CRYPTO_RsaSignature **sig = rs->dst;
 
   if (NULL != *sig)
-  {
-    GNUNET_CRYPTO_rsa_signature_free (*sig);
-    *sig = NULL;
-  }
+    {
+      GNUNET_CRYPTO_rsa_signature_free(*sig);
+      *sig = NULL;
+    }
 }
 
 
 /**
-  * RSA signature expected.
-  *
-  * @param[out] sig where to store the result;
-  * @return array entry for the result specification to use
-  */
+ * RSA signature expected.
+ *
+ * @param[out] sig where to store the result;
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_rsa_signature (struct GNUNET_CRYPTO_RsaSignature **sig)
+GNUNET_MY_result_spec_rsa_signature(struct GNUNET_CRYPTO_RsaSignature **sig)
 {
   struct GNUNET_MY_ResultSpec res =
   {
@@ -498,6 +498,7 @@ GNUNET_MY_result_spec_rsa_signature (struct GNUNET_CRYPTO_RsaSignature **sig)
     .dst_size = 0,
     .num_fields = 1
   };
+
   return res;
 }
 
@@ -515,11 +516,11 @@ GNUNET_MY_result_spec_rsa_signature (struct GNUNET_CRYPTO_RsaSignature **sig)
  *    #GNUNET_SYSERR if a result was invalid (non existing field or NULL)
  */
 static int
-pre_extract_string (void * cls,
-                    struct GNUNET_MY_ResultSpec *rs,
-                    MYSQL_STMT *stmt,
-                    unsigned int column,
-                    MYSQL_BIND *results)
+pre_extract_string(void * cls,
+                   struct GNUNET_MY_ResultSpec *rs,
+                   MYSQL_STMT *stmt,
+                   unsigned int column,
+                   MYSQL_BIND *results)
 {
   results[0].buffer = NULL;
   results[0].buffer_length = 0;
@@ -545,39 +546,39 @@ pre_extract_string (void * cls,
  *    #GNUNET_SYSERR if a result was invalid (non existing field or NULL)
  */
 static int
-post_extract_string (void * cls,
-                     struct GNUNET_MY_ResultSpec *rs,
-                     MYSQL_STMT *stmt,
-                     unsigned int column,
-                     MYSQL_BIND *results)
+post_extract_string(void * cls,
+                    struct GNUNET_MY_ResultSpec *rs,
+                    MYSQL_STMT *stmt,
+                    unsigned int column,
+                    MYSQL_BIND *results)
 {
-  size_t size = (size_t) rs->mysql_bind_output_length;
+  size_t size = (size_t)rs->mysql_bind_output_length;
   char *buf;
 
   if (rs->mysql_bind_output_length != size)
     return GNUNET_SYSERR;
   if (*results->is_null)
-  {
-    *(void **) rs->dst = NULL;
-    return GNUNET_OK;
-  }
+    {
+      *(void **)rs->dst = NULL;
+      return GNUNET_OK;
+    }
 
-  buf = GNUNET_malloc (size);
+  buf = GNUNET_malloc(size);
   results[0].buffer = buf;
   results[0].buffer_length = size;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
 
   if (0 !=
-      mysql_stmt_fetch_column (stmt,
-                               results,
-                               column,
-                               0))
-  {
-    GNUNET_free (buf);
-    return GNUNET_SYSERR;
-  }
+      mysql_stmt_fetch_column(stmt,
+                              results,
+                              column,
+                              0))
+    {
+      GNUNET_free(buf);
+      return GNUNET_SYSERR;
+    }
   buf[size] = '\0';
-  *(void **) rs->dst = buf;
+  *(void **)rs->dst = buf;
   return GNUNET_OK;
 }
 
@@ -589,16 +590,17 @@ post_extract_string (void * cls,
  * @return array entry for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_string (char **dst)
+GNUNET_MY_result_spec_string(char **dst)
 {
   struct GNUNET_MY_ResultSpec res = {
     .pre_conv = &pre_extract_string,
     .post_conv = &post_extract_string,
     .cleaner = NULL,
-    .dst = (void *) dst,
+    .dst = (void *)dst,
     .dst_size = 0,
     .num_fields = 1
   };
+
   return res;
 }
 
@@ -609,25 +611,26 @@ GNUNET_MY_result_spec_string (char **dst)
  * @param name name of the field in the table
  * @param[out] at where to store the result
  * @return array entry for the result specification to use
-  */
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_absolute_time (struct GNUNET_TIME_Absolute *at)
+GNUNET_MY_result_spec_absolute_time(struct GNUNET_TIME_Absolute *at)
 {
-  return GNUNET_MY_result_spec_uint64 (&at->abs_value_us);
+  return GNUNET_MY_result_spec_uint64(&at->abs_value_us);
 }
 
 
 /**
-  * Absolute time in network byte order expected
-  *
-  * @param[out] at where to store the result
-  * @return array entry for the result specification to use
-  */
+ * Absolute time in network byte order expected
+ *
+ * @param[out] at where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_absolute_time_nbo (struct GNUNET_TIME_AbsoluteNBO *at)
+GNUNET_MY_result_spec_absolute_time_nbo(struct GNUNET_TIME_AbsoluteNBO *at)
 {
   struct GNUNET_MY_ResultSpec res =
-    GNUNET_MY_result_spec_auto_from_type (&at->abs_value_us__);
+    GNUNET_MY_result_spec_auto_from_type(&at->abs_value_us__);
+
   return res;
 }
 
@@ -645,11 +648,11 @@ GNUNET_MY_result_spec_absolute_time_nbo (struct GNUNET_TIME_AbsoluteNBO *at)
  *   #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
  */
 static int
-pre_extract_uint16 (void *cls,
-                    struct GNUNET_MY_ResultSpec *rs,
-                    MYSQL_STMT *stmt,
-                    unsigned int column,
-                    MYSQL_BIND *results)
+pre_extract_uint16(void *cls,
+                   struct GNUNET_MY_ResultSpec *rs,
+                   MYSQL_STMT *stmt,
+                   unsigned int column,
+                   MYSQL_BIND *results)
 {
   results[0].buffer = rs->dst;
   results[0].buffer_length = rs->dst_size;
@@ -675,11 +678,11 @@ pre_extract_uint16 (void *cls,
  *   #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
  */
 static int
-post_extract_uint16 (void *cls,
-                     struct GNUNET_MY_ResultSpec *rs,
-                     MYSQL_STMT *stmt,
-                     unsigned int column,
-                     MYSQL_BIND *results)
+post_extract_uint16(void *cls,
+                    struct GNUNET_MY_ResultSpec *rs,
+                    MYSQL_STMT *stmt,
+                    unsigned int column,
+                    MYSQL_BIND *results)
 {
   if (rs->dst_size != rs->mysql_bind_output_length)
     return GNUNET_SYSERR;
@@ -696,39 +699,40 @@ post_extract_uint16 (void *cls,
  * @return array entry for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_uint16 (uint16_t *u16)
+GNUNET_MY_result_spec_uint16(uint16_t *u16)
 {
   struct GNUNET_MY_ResultSpec res = {
     .pre_conv = &pre_extract_uint16,
     .post_conv = &post_extract_uint16,
     .cleaner = NULL,
-    .dst = (void *) u16,
-    .dst_size = sizeof (*u16),
+    .dst = (void *)u16,
+    .dst_size = sizeof(*u16),
     .num_fields = 1
   };
+
   return res;
 }
 
 
 /**
-  * Extrac data from a  MYSQL database @a result at row @a row
-  *
-  * @param cls closure
-  * @param cls closure
-  * @param[in,out] rs
-  * @param stmt the mysql statement that is being run
-  * @param column the column that is being processed
-  * @param[out] results
-  * @return
-  *      #GNUNET_OK if all results could be extracted
-  *      #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
-  */
+ * Extrac data from a  MYSQL database @a result at row @a row
+ *
+ * @param cls closure
+ * @param cls closure
+ * @param[in,out] rs
+ * @param stmt the mysql statement that is being run
+ * @param column the column that is being processed
+ * @param[out] results
+ * @return
+ *      #GNUNET_OK if all results could be extracted
+ *      #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
 static int
-pre_extract_uint32 (void *cls,
-                    struct GNUNET_MY_ResultSpec *rs,
-                    MYSQL_STMT *stmt,
-                    unsigned int column,
-                    MYSQL_BIND *results)
+pre_extract_uint32(void *cls,
+                   struct GNUNET_MY_ResultSpec *rs,
+                   MYSQL_STMT *stmt,
+                   unsigned int column,
+                   MYSQL_BIND *results)
 {
   results[0].buffer = rs->dst;
   results[0].buffer_length = rs->dst_size;
@@ -742,24 +746,24 @@ pre_extract_uint32 (void *cls,
 
 
 /**
-  * Extrac data from a  MYSQL database @a result at row @a row
-  *
-  * @param cls closure
-  * @param cls closure
-  * @param[in,out] rs
-  * @param stmt the mysql statement that is being run
-  * @param column the column that is being processed
-  * @param[out] results
-  * @return
-  *      #GNUNET_OK if all results could be extracted
-  *      #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
-  */
+ * Extrac data from a  MYSQL database @a result at row @a row
+ *
+ * @param cls closure
+ * @param cls closure
+ * @param[in,out] rs
+ * @param stmt the mysql statement that is being run
+ * @param column the column that is being processed
+ * @param[out] results
+ * @return
+ *      #GNUNET_OK if all results could be extracted
+ *      #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
 static int
-post_extract_uint32 (void *cls,
-                     struct GNUNET_MY_ResultSpec *rs,
-                     MYSQL_STMT * stmt,
-                     unsigned int column,
-                     MYSQL_BIND *results)
+post_extract_uint32(void *cls,
+                    struct GNUNET_MY_ResultSpec *rs,
+                    MYSQL_STMT * stmt,
+                    unsigned int column,
+                    MYSQL_BIND *results)
 {
   if (rs->dst_size != rs->mysql_bind_output_length)
     return GNUNET_SYSERR;
@@ -770,22 +774,23 @@ post_extract_uint32 (void *cls,
 
 
 /**
-  * uint32_t expected
-  *
-  * @param[out] u32 where to store the result
-  * @return array entry for the result specification to use
-  */
+ * uint32_t expected
+ *
+ * @param[out] u32 where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_uint32 (uint32_t *u32)
+GNUNET_MY_result_spec_uint32(uint32_t *u32)
 {
   struct GNUNET_MY_ResultSpec res = {
     .pre_conv = &pre_extract_uint32,
     .post_conv = &post_extract_uint32,
     .cleaner = NULL,
-    .dst = (void *) u32,
-    .dst_size = sizeof (*u32),
+    .dst = (void *)u32,
+    .dst_size = sizeof(*u32),
     .num_fields = 1
   };
+
   return res;
 }
 
@@ -803,13 +808,13 @@ GNUNET_MY_result_spec_uint32 (uint32_t *u32)
  *    #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
  */
 static int
-pre_extract_uint64 (void *cls,
-                    struct GNUNET_MY_ResultSpec *rs,
-                    MYSQL_STMT *stmt,
-                    unsigned int column,
-                    MYSQL_BIND *results)
+pre_extract_uint64(void *cls,
+                   struct GNUNET_MY_ResultSpec *rs,
+                   MYSQL_STMT *stmt,
+                   unsigned int column,
+                   MYSQL_BIND *results)
 {
-  if (sizeof (uint64_t) != rs->dst_size)
+  if (sizeof(uint64_t) != rs->dst_size)
     return GNUNET_SYSERR;
   results[0].buffer = rs->dst;
   results[0].buffer_length = rs->dst_size;
@@ -835,13 +840,13 @@ pre_extract_uint64 (void *cls,
  *    #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
  */
 static int
-post_extract_uint64 (void *cls,
-                     struct GNUNET_MY_ResultSpec *rs,
-                     MYSQL_STMT *stmt,
-                     unsigned int column,
-                     MYSQL_BIND *results)
+post_extract_uint64(void *cls,
+                    struct GNUNET_MY_ResultSpec *rs,
+                    MYSQL_STMT *stmt,
+                    unsigned int column,
+                    MYSQL_BIND *results)
 {
-  if (sizeof (uint64_t) != rs->dst_size)
+  if (sizeof(uint64_t) != rs->dst_size)
     return GNUNET_SYSERR;
   if (*results->is_null)
     return GNUNET_SYSERR;
@@ -856,16 +861,17 @@ post_extract_uint64 (void *cls,
  * @return array entry for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_uint64 (uint64_t *u64)
+GNUNET_MY_result_spec_uint64(uint64_t *u64)
 {
   struct GNUNET_MY_ResultSpec res = {
     .pre_conv = &pre_extract_uint64,
     .post_conv = &post_extract_uint64,
     .cleaner = NULL,
-    .dst = (void *) u64,
-    .dst_size = sizeof (*u64),
+    .dst = (void *)u64,
+    .dst_size = sizeof(*u64),
     .num_fields = 1
   };
+
   return res;
 }