1 files changed, 121 insertions, 119 deletions

diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c
index 1addef499..ce317a656 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/sq/sq_query_helper.c
@@ -38,18 +38,18 @@
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_fixed_blob(void *cls,
-                const void *data,
-                size_t data_len,
-                sqlite3_stmt *stmt,
-                unsigned int off)
+bind_fixed_blob (void *cls,
+                 const void *data,
+                 size_t data_len,
+                 sqlite3_stmt *stmt,
+                 unsigned int off)
 {
   if (SQLITE_OK !=
-      sqlite3_bind_blob64(stmt,
-                          (int)off,
-                          data,
-                          (sqlite3_uint64)data_len,
-                          SQLITE_TRANSIENT))
+      sqlite3_bind_blob64 (stmt,
+                           (int) off,
+                           data,
+                           (sqlite3_uint64) data_len,
+                           SQLITE_TRANSIENT))
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -63,8 +63,8 @@ bind_fixed_blob(void *cls,
  * @oaran ptr_size number of bytes in @a ptr
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_fixed_size(const void *ptr,
-                                 size_t ptr_size)
+GNUNET_SQ_query_param_fixed_size (const void *ptr,
+                                  size_t ptr_size)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_fixed_blob,
@@ -89,26 +89,26 @@ GNUNET_SQ_query_param_fixed_size(const void *ptr,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_string(void *cls,
-            const void *data,
-            size_t data_len,
-            sqlite3_stmt *stmt,
-            unsigned int off)
+bind_string (void *cls,
+             const void *data,
+             size_t data_len,
+             sqlite3_stmt *stmt,
+             unsigned int off)
 {
   if (NULL == data)
-    {
-      if (SQLITE_OK !=
-          sqlite3_bind_null(stmt,
-                            (int)off))
-        return GNUNET_SYSERR;
-      return GNUNET_OK;
-    }
+  {
+    if (SQLITE_OK !=
+        sqlite3_bind_null (stmt,
+                           (int) off))
+      return GNUNET_SYSERR;
+    return GNUNET_OK;
+  }
   if (SQLITE_OK !=
-      sqlite3_bind_text(stmt,
-                        (int)off,
-                        (const char *)data,
-                        -1,
-                        SQLITE_TRANSIENT))
+      sqlite3_bind_text (stmt,
+                         (int) off,
+                         (const char *) data,
+                         -1,
+                         SQLITE_TRANSIENT))
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -120,7 +120,7 @@ bind_string(void *cls,
  * @param ptr pointer to the string query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_string(const char *ptr)
+GNUNET_SQ_query_param_string (const char *ptr)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_string,
@@ -144,30 +144,30 @@ GNUNET_SQ_query_param_string(const char *ptr)
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_rsa_pub(void *cls,
-             const void *data,
-             size_t data_len,
-             sqlite3_stmt *stmt,
-             unsigned int off)
+bind_rsa_pub (void *cls,
+              const void *data,
+              size_t data_len,
+              sqlite3_stmt *stmt,
+              unsigned int off)
 {
   const struct GNUNET_CRYPTO_RsaPublicKey *rsa = data;
   char *buf;
   size_t buf_size;
 
-  GNUNET_break(NULL == cls);
-  buf_size = GNUNET_CRYPTO_rsa_public_key_encode(rsa,
-                                                 &buf);
+  GNUNET_break (NULL == cls);
+  buf_size = GNUNET_CRYPTO_rsa_public_key_encode (rsa,
+                                                  &buf);
   if (SQLITE_OK !=
-      sqlite3_bind_blob64(stmt,
-                          (int)off,
-                          buf,
-                          (sqlite3_uint64)buf_size,
-                          SQLITE_TRANSIENT))
-    {
-      GNUNET_free(buf);
-      return GNUNET_SYSERR;
-    }
-  GNUNET_free(buf);
+      sqlite3_bind_blob64 (stmt,
+                           (int) off,
+                           buf,
+                           (sqlite3_uint64) buf_size,
+                           SQLITE_TRANSIENT))
+  {
+    GNUNET_free (buf);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (buf);
   return GNUNET_OK;
 }
 
@@ -179,7 +179,8 @@ bind_rsa_pub(void *cls,
  * @param x the query parameter to pass.
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_rsa_public_key(const struct GNUNET_CRYPTO_RsaPublicKey *x)
+GNUNET_SQ_query_param_rsa_public_key (const struct
+                                      GNUNET_CRYPTO_RsaPublicKey *x)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_rsa_pub,
@@ -203,30 +204,30 @@ GNUNET_SQ_query_param_rsa_public_key(const struct GNUNET_CRYPTO_RsaPublicKey *x)
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_rsa_sig(void *cls,
-             const void *data,
-             size_t data_len,
-             sqlite3_stmt *stmt,
-             unsigned int off)
+bind_rsa_sig (void *cls,
+              const void *data,
+              size_t data_len,
+              sqlite3_stmt *stmt,
+              unsigned int off)
 {
   const struct GNUNET_CRYPTO_RsaSignature *sig = data;
   char *buf;
   size_t buf_size;
 
-  GNUNET_break(NULL == cls);
-  buf_size = GNUNET_CRYPTO_rsa_signature_encode(sig,
-                                                &buf);
+  GNUNET_break (NULL == cls);
+  buf_size = GNUNET_CRYPTO_rsa_signature_encode (sig,
+                                                 &buf);
   if (SQLITE_OK !=
-      sqlite3_bind_blob64(stmt,
-                          (int)off,
-                          buf,
-                          (sqlite3_uint64)buf_size,
-                          SQLITE_TRANSIENT))
-    {
-      GNUNET_free(buf);
-      return GNUNET_SYSERR;
-    }
-  GNUNET_free(buf);
+      sqlite3_bind_blob64 (stmt,
+                           (int) off,
+                           buf,
+                           (sqlite3_uint64) buf_size,
+                           SQLITE_TRANSIENT))
+  {
+    GNUNET_free (buf);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (buf);
   return GNUNET_OK;
 }
 
@@ -238,7 +239,7 @@ bind_rsa_sig(void *cls,
  * @param x the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_rsa_signature(const struct GNUNET_CRYPTO_RsaSignature *x)
+GNUNET_SQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_rsa_sig,
@@ -262,11 +263,11 @@ GNUNET_SQ_query_param_rsa_signature(const struct GNUNET_CRYPTO_RsaSignature *x)
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_abstime(void *cls,
-             const void *data,
-             size_t data_len,
-             sqlite3_stmt *stmt,
-             unsigned int off)
+bind_abstime (void *cls,
+              const void *data,
+              size_t data_len,
+              sqlite3_stmt *stmt,
+              unsigned int off)
 {
   const struct GNUNET_TIME_Absolute *u = data;
   struct GNUNET_TIME_Absolute abs;
@@ -274,11 +275,11 @@ bind_abstime(void *cls,
   abs = *u;
   if (abs.abs_value_us > INT64_MAX)
     abs.abs_value_us = INT64_MAX;
-  GNUNET_assert(sizeof(uint64_t) == data_len);
+  GNUNET_assert (sizeof(uint64_t) == data_len);
   if (SQLITE_OK !=
-      sqlite3_bind_int64(stmt,
-                         (int)off,
-                         (sqlite3_int64)abs.abs_value_us))
+      sqlite3_bind_int64 (stmt,
+                          (int) off,
+                          (sqlite3_int64) abs.abs_value_us))
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -291,7 +292,7 @@ bind_abstime(void *cls,
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x)
+GNUNET_SQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_abstime,
@@ -316,23 +317,23 @@ GNUNET_SQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x)
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_nbotime(void *cls,
-             const void *data,
-             size_t data_len,
-             sqlite3_stmt *stmt,
-             unsigned int off)
+bind_nbotime (void *cls,
+              const void *data,
+              size_t data_len,
+              sqlite3_stmt *stmt,
+              unsigned int off)
 {
   const struct GNUNET_TIME_AbsoluteNBO *u = data;
   struct GNUNET_TIME_Absolute abs;
 
-  abs = GNUNET_TIME_absolute_ntoh(*u);
+  abs = GNUNET_TIME_absolute_ntoh (*u);
   if (abs.abs_value_us > INT64_MAX)
     abs.abs_value_us = INT64_MAX;
-  GNUNET_assert(sizeof(uint64_t) == data_len);
+  GNUNET_assert (sizeof(uint64_t) == data_len);
   if (SQLITE_OK !=
-      sqlite3_bind_int64(stmt,
-                         (int)off,
-                         (sqlite3_int64)abs.abs_value_us))
+      sqlite3_bind_int64 (stmt,
+                          (int) off,
+                          (sqlite3_int64) abs.abs_value_us))
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -345,7 +346,8 @@ bind_nbotime(void *cls,
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_absolute_time_nbo(const struct GNUNET_TIME_AbsoluteNBO *x)
+GNUNET_SQ_query_param_absolute_time_nbo (const struct
+                                         GNUNET_TIME_AbsoluteNBO *x)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_nbotime,
@@ -370,19 +372,19 @@ GNUNET_SQ_query_param_absolute_time_nbo(const struct GNUNET_TIME_AbsoluteNBO *x)
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_u16(void *cls,
-         const void *data,
-         size_t data_len,
-         sqlite3_stmt *stmt,
-         unsigned int off)
+bind_u16 (void *cls,
+          const void *data,
+          size_t data_len,
+          sqlite3_stmt *stmt,
+          unsigned int off)
 {
   const uint16_t *u = data;
 
-  GNUNET_assert(sizeof(uint16_t) == data_len);
+  GNUNET_assert (sizeof(uint16_t) == data_len);
   if (SQLITE_OK !=
-      sqlite3_bind_int(stmt,
-                       (int)off,
-                       (int)*u))
+      sqlite3_bind_int (stmt,
+                        (int) off,
+                        (int) *u))
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -394,7 +396,7 @@ bind_u16(void *cls,
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_uint16(const uint16_t *x)
+GNUNET_SQ_query_param_uint16 (const uint16_t *x)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_u16,
@@ -419,19 +421,19 @@ GNUNET_SQ_query_param_uint16(const uint16_t *x)
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_u32(void *cls,
-         const void *data,
-         size_t data_len,
-         sqlite3_stmt *stmt,
-         unsigned int off)
+bind_u32 (void *cls,
+          const void *data,
+          size_t data_len,
+          sqlite3_stmt *stmt,
+          unsigned int off)
 {
   const uint32_t *u = data;
 
-  GNUNET_assert(sizeof(uint32_t) == data_len);
+  GNUNET_assert (sizeof(uint32_t) == data_len);
   if (SQLITE_OK !=
-      sqlite3_bind_int64(stmt,
-                         (int)off,
-                         (sqlite3_int64) * u))
+      sqlite3_bind_int64 (stmt,
+                          (int) off,
+                          (sqlite3_int64) * u))
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -442,7 +444,7 @@ bind_u32(void *cls,
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_uint32(const uint32_t *x)
+GNUNET_SQ_query_param_uint32 (const uint32_t *x)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_u32,
@@ -467,19 +469,19 @@ GNUNET_SQ_query_param_uint32(const uint32_t *x)
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 static int
-bind_u64(void *cls,
-         const void *data,
-         size_t data_len,
-         sqlite3_stmt *stmt,
-         unsigned int off)
+bind_u64 (void *cls,
+          const void *data,
+          size_t data_len,
+          sqlite3_stmt *stmt,
+          unsigned int off)
 {
   const uint64_t *u = data;
 
-  GNUNET_assert(sizeof(uint64_t) == data_len);
+  GNUNET_assert (sizeof(uint64_t) == data_len);
   if (SQLITE_OK !=
-      sqlite3_bind_int64(stmt,
-                         (int)off,
-                         (sqlite3_int64) * u))
+      sqlite3_bind_int64 (stmt,
+                          (int) off,
+                          (sqlite3_int64) * u))
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -491,7 +493,7 @@ bind_u64(void *cls,
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_uint64(const uint64_t *x)
+GNUNET_SQ_query_param_uint64 (const uint64_t *x)
 {
   struct GNUNET_SQ_QueryParam qp = {
     .conv = &bind_u64,