1 files changed, 329 insertions, 327 deletions

diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/namecache/plugin_namecache_sqlite.c
index f493e015f..e52438b4e 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/namecache/plugin_namecache_sqlite.c
@@ -1,22 +1,22 @@
- /*
-  * This file is part of GNUnet
-  * Copyright (C) 2009-2013 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) 2009-2013 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 namecache/plugin_namecache_sqlite.c
@@ -49,17 +49,15 @@
  * a failure of the command 'cmd' on file 'filename'
  * with the message given by strerror(errno).
  */
-#define LOG_SQLITE(db, level, cmd) do { GNUNET_log_from (level, "namecache-sqlite", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while(0)
+#define LOG_SQLITE(db, level, cmd) do { GNUNET_log_from(level, "namecache-sqlite", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while (0)
 
-#define LOG(kind,...) GNUNET_log_from (kind, "namecache-sqlite", __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from(kind, "namecache-sqlite", __VA_ARGS__)
 
 
 /**
  * Context for all functions in this plugin.
  */
-struct Plugin
-{
-
+struct Plugin {
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
   /**
@@ -91,7 +89,6 @@ struct Plugin
    * Precompiled SQL for removing expired blocks
    */
   sqlite3_stmt *expire_blocks;
-
 };
 
 
@@ -104,100 +101,100 @@ struct Plugin
  * @return #GNUNET_OK on success
  */
 static int
-database_setup (struct Plugin *plugin)
+database_setup(struct Plugin *plugin)
 {
   struct GNUNET_SQ_ExecuteStatement es[] = {
-    GNUNET_SQ_make_try_execute ("PRAGMA temp_store=MEMORY"),
-    GNUNET_SQ_make_try_execute ("PRAGMA synchronous=NORMAL"),
-    GNUNET_SQ_make_try_execute ("PRAGMA legacy_file_format=OFF"),
-    GNUNET_SQ_make_try_execute ("PRAGMA auto_vacuum=INCREMENTAL"),
-    GNUNET_SQ_make_try_execute ("PRAGMA encoding=\"UTF-8\""),
-    GNUNET_SQ_make_try_execute ("PRAGMA locking_mode=EXCLUSIVE"),
-    GNUNET_SQ_make_try_execute ("PRAGMA page_size=4092"),
-    GNUNET_SQ_make_try_execute ("PRAGMA journal_mode=WAL"),
-    GNUNET_SQ_make_execute ("CREATE TABLE IF NOT EXISTS ns096blocks ("
-                            " query BLOB NOT NULL,"
-                            " block BLOB NOT NULL,"
-                            " expiration_time INT8 NOT NULL"
-                            ")"),
-    GNUNET_SQ_make_execute ("CREATE INDEX IF NOT EXISTS ir_query_hash "
-                            "ON ns096blocks (query,expiration_time)"),
-    GNUNET_SQ_make_execute ("CREATE INDEX IF NOT EXISTS ir_block_expiration "
-                            "ON ns096blocks (expiration_time)"),
+    GNUNET_SQ_make_try_execute("PRAGMA temp_store=MEMORY"),
+    GNUNET_SQ_make_try_execute("PRAGMA synchronous=NORMAL"),
+    GNUNET_SQ_make_try_execute("PRAGMA legacy_file_format=OFF"),
+    GNUNET_SQ_make_try_execute("PRAGMA auto_vacuum=INCREMENTAL"),
+    GNUNET_SQ_make_try_execute("PRAGMA encoding=\"UTF-8\""),
+    GNUNET_SQ_make_try_execute("PRAGMA locking_mode=EXCLUSIVE"),
+    GNUNET_SQ_make_try_execute("PRAGMA page_size=4092"),
+    GNUNET_SQ_make_try_execute("PRAGMA journal_mode=WAL"),
+    GNUNET_SQ_make_execute("CREATE TABLE IF NOT EXISTS ns096blocks ("
+                           " query BLOB NOT NULL,"
+                           " block BLOB NOT NULL,"
+                           " expiration_time INT8 NOT NULL"
+                           ")"),
+    GNUNET_SQ_make_execute("CREATE INDEX IF NOT EXISTS ir_query_hash "
+                           "ON ns096blocks (query,expiration_time)"),
+    GNUNET_SQ_make_execute("CREATE INDEX IF NOT EXISTS ir_block_expiration "
+                           "ON ns096blocks (expiration_time)"),
     GNUNET_SQ_EXECUTE_STATEMENT_END
   };
   struct GNUNET_SQ_PrepareStatement ps[] = {
-    GNUNET_SQ_make_prepare ("INSERT INTO ns096blocks (query,block,expiration_time) VALUES (?, ?, ?)",
-                            &plugin->cache_block),
-    GNUNET_SQ_make_prepare ("DELETE FROM ns096blocks WHERE expiration_time<?",
-                            &plugin->expire_blocks),
-    GNUNET_SQ_make_prepare ("DELETE FROM ns096blocks WHERE query=? AND expiration_time<=?",
-                            &plugin->delete_block),
-    GNUNET_SQ_make_prepare ("SELECT block FROM ns096blocks WHERE query=? "
-                            "ORDER BY expiration_time DESC LIMIT 1",
-                            &plugin->lookup_block),
+    GNUNET_SQ_make_prepare("INSERT INTO ns096blocks (query,block,expiration_time) VALUES (?, ?, ?)",
+                           &plugin->cache_block),
+    GNUNET_SQ_make_prepare("DELETE FROM ns096blocks WHERE expiration_time<?",
+                           &plugin->expire_blocks),
+    GNUNET_SQ_make_prepare("DELETE FROM ns096blocks WHERE query=? AND expiration_time<=?",
+                           &plugin->delete_block),
+    GNUNET_SQ_make_prepare("SELECT block FROM ns096blocks WHERE query=? "
+                           "ORDER BY expiration_time DESC LIMIT 1",
+                           &plugin->lookup_block),
     GNUNET_SQ_PREPARE_END
   };
   char *afsdir;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (plugin->cfg,
-                                               "namecache-sqlite",
-                                               "FILENAME",
-                                               &afsdir))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "namecache-sqlite",
-                               "FILENAME");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_DISK_file_test (afsdir))
-  {
-    if (GNUNET_OK !=
-        GNUNET_DISK_directory_create_for_file (afsdir))
+      GNUNET_CONFIGURATION_get_value_filename(plugin->cfg,
+                                              "namecache-sqlite",
+                                              "FILENAME",
+                                              &afsdir))
     {
-      GNUNET_break (0);
-      GNUNET_free (afsdir);
+      GNUNET_log_config_missing(GNUNET_ERROR_TYPE_ERROR,
+                                "namecache-sqlite",
+                                "FILENAME");
       return GNUNET_SYSERR;
     }
-  }
+  if (GNUNET_OK !=
+      GNUNET_DISK_file_test(afsdir))
+    {
+      if (GNUNET_OK !=
+          GNUNET_DISK_directory_create_for_file(afsdir))
+        {
+          GNUNET_break(0);
+          GNUNET_free(afsdir);
+          return GNUNET_SYSERR;
+        }
+    }
   /* afsdir should be UTF-8-encoded. If it isn't, it's a bug */
   plugin->fn = afsdir;
 
   /* Open database and precompile statements */
   if (SQLITE_OK !=
-      sqlite3_open (plugin->fn, &plugin->dbh))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _("Unable to initialize SQLite: %s.\n"),
-         sqlite3_errmsg (plugin->dbh));
-    return GNUNET_SYSERR;
-  }
+      sqlite3_open(plugin->fn, &plugin->dbh))
+    {
+      LOG(GNUNET_ERROR_TYPE_ERROR,
+          _("Unable to initialize SQLite: %s.\n"),
+          sqlite3_errmsg(plugin->dbh));
+      return GNUNET_SYSERR;
+    }
   if (GNUNET_OK !=
-      GNUNET_SQ_exec_statements (plugin->dbh,
-                                 es))
-  {
-    GNUNET_break (0);
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _("Failed to setup database at `%s'\n"),
-         plugin->fn);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_break (SQLITE_OK ==
-                sqlite3_busy_timeout (plugin->dbh,
-                                      BUSY_TIMEOUT_MS));
-  
+      GNUNET_SQ_exec_statements(plugin->dbh,
+                                es))
+    {
+      GNUNET_break(0);
+      LOG(GNUNET_ERROR_TYPE_ERROR,
+          _("Failed to setup database at `%s'\n"),
+          plugin->fn);
+      return GNUNET_SYSERR;
+    }
+  GNUNET_break(SQLITE_OK ==
+               sqlite3_busy_timeout(plugin->dbh,
+                                    BUSY_TIMEOUT_MS));
+
   if (GNUNET_OK !=
-      GNUNET_SQ_prepare (plugin->dbh,
-                         ps))
-  {
-    GNUNET_break (0);
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _("Failed to setup database at `%s'\n"),
-         plugin->fn);
-    return GNUNET_SYSERR;
-  }
+      GNUNET_SQ_prepare(plugin->dbh,
+                        ps))
+    {
+      GNUNET_break(0);
+      LOG(GNUNET_ERROR_TYPE_ERROR,
+          _("Failed to setup database at `%s'\n"),
+          plugin->fn);
+      return GNUNET_SYSERR;
+    }
 
   return GNUNET_OK;
 }
@@ -209,50 +206,50 @@ database_setup (struct Plugin *plugin)
  * @param plugin the plugin context (state for this module)
  */
 static void
-database_shutdown (struct Plugin *plugin)
+database_shutdown(struct Plugin *plugin)
 {
   int result;
   sqlite3_stmt *stmt;
 
   if (NULL != plugin->cache_block)
-    sqlite3_finalize (plugin->cache_block);
+    sqlite3_finalize(plugin->cache_block);
   if (NULL != plugin->lookup_block)
-    sqlite3_finalize (plugin->lookup_block);
+    sqlite3_finalize(plugin->lookup_block);
   if (NULL != plugin->expire_blocks)
-    sqlite3_finalize (plugin->expire_blocks);
+    sqlite3_finalize(plugin->expire_blocks);
   if (NULL != plugin->delete_block)
-    sqlite3_finalize (plugin->delete_block);
-  result = sqlite3_close (plugin->dbh);
+    sqlite3_finalize(plugin->delete_block);
+  result = sqlite3_close(plugin->dbh);
   if (result == SQLITE_BUSY)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _("Tried to close sqlite without finalizing all prepared statements.\n"));
-    stmt = sqlite3_next_stmt (plugin->dbh,
-                              NULL);
-    while (stmt != NULL)
     {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                       "sqlite",
-                       "Closing statement %p\n",
-                       stmt);
-      result = sqlite3_finalize (stmt);
-      if (result != SQLITE_OK)
-        GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
-                         "sqlite",
-                         "Failed to close statement %p: %d\n",
-                         stmt,
-                         result);
-      stmt = sqlite3_next_stmt (plugin->dbh,
-                                NULL);
+      LOG(GNUNET_ERROR_TYPE_WARNING,
+          _("Tried to close sqlite without finalizing all prepared statements.\n"));
+      stmt = sqlite3_next_stmt(plugin->dbh,
+                               NULL);
+      while (stmt != NULL)
+        {
+          GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG,
+                          "sqlite",
+                          "Closing statement %p\n",
+                          stmt);
+          result = sqlite3_finalize(stmt);
+          if (result != SQLITE_OK)
+            GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING,
+                            "sqlite",
+                            "Failed to close statement %p: %d\n",
+                            stmt,
+                            result);
+          stmt = sqlite3_next_stmt(plugin->dbh,
+                                   NULL);
+        }
+      result = sqlite3_close(plugin->dbh);
     }
-    result = sqlite3_close (plugin->dbh);
-  }
   if (SQLITE_OK != result)
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_ERROR,
-                "sqlite3_close");
+    LOG_SQLITE(plugin,
+               GNUNET_ERROR_TYPE_ERROR,
+               "sqlite3_close");
 
-  GNUNET_free_non_null (plugin->fn);
+  GNUNET_free_non_null(plugin->fn);
 }
 
 
@@ -262,48 +259,50 @@ database_shutdown (struct Plugin *plugin)
  * @param plugin the plugin
  */
 static void
-namecache_sqlite_expire_blocks (struct Plugin *plugin)
+namecache_sqlite_expire_blocks(struct Plugin *plugin)
 {
   struct GNUNET_TIME_Absolute now;
   struct GNUNET_SQ_QueryParam params[] = {
-    GNUNET_SQ_query_param_absolute_time (&now),
+    GNUNET_SQ_query_param_absolute_time(&now),
     GNUNET_SQ_query_param_end
   };
   int n;
 
-  now = GNUNET_TIME_absolute_get ();
+  now = GNUNET_TIME_absolute_get();
   if (GNUNET_OK !=
-      GNUNET_SQ_bind (plugin->expire_blocks,
-                      params))
-  {
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_bind_XXXX");
-    GNUNET_SQ_reset (plugin->dbh,
-                     plugin->expire_blocks);
-    return;
-  }
-  n = sqlite3_step (plugin->expire_blocks);
-  GNUNET_SQ_reset (plugin->dbh,
-                   plugin->expire_blocks);
+      GNUNET_SQ_bind(plugin->expire_blocks,
+                     params))
+    {
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_bind_XXXX");
+      GNUNET_SQ_reset(plugin->dbh,
+                      plugin->expire_blocks);
+      return;
+    }
+  n = sqlite3_step(plugin->expire_blocks);
+  GNUNET_SQ_reset(plugin->dbh,
+                  plugin->expire_blocks);
   switch (n)
-  {
-  case SQLITE_DONE:
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                     "sqlite",
-                     "Records expired\n");
-    return;
-  case SQLITE_BUSY:
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_step");
-    return;
-  default:
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_step");
-    return;
-  }
+    {
+    case SQLITE_DONE:
+      GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG,
+                      "sqlite",
+                      "Records expired\n");
+      return;
+
+    case SQLITE_BUSY:
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_step");
+      return;
+
+    default:
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_step");
+      return;
+    }
 }
 
 
@@ -315,120 +314,123 @@ namecache_sqlite_expire_blocks (struct Plugin *plugin)
  * @return #GNUNET_OK on success, else #GNUNET_SYSERR
  */
 static int
-namecache_sqlite_cache_block (void *cls,
-                              const struct GNUNET_GNSRECORD_Block *block)
+namecache_sqlite_cache_block(void *cls,
+                             const struct GNUNET_GNSRECORD_Block *block)
 {
   static struct GNUNET_TIME_Absolute last_expire;
   struct Plugin *plugin = cls;
   struct GNUNET_HashCode query;
   struct GNUNET_TIME_Absolute expiration;
-  size_t block_size = ntohl (block->purpose.size) +
-    sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
-    sizeof (struct GNUNET_CRYPTO_EcdsaSignature);
+  size_t block_size = ntohl(block->purpose.size) +
+                      sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) +
+                      sizeof(struct GNUNET_CRYPTO_EcdsaSignature);
   struct GNUNET_SQ_QueryParam del_params[] = {
-    GNUNET_SQ_query_param_auto_from_type (&query),
-    GNUNET_SQ_query_param_absolute_time (&expiration),
+    GNUNET_SQ_query_param_auto_from_type(&query),
+    GNUNET_SQ_query_param_absolute_time(&expiration),
     GNUNET_SQ_query_param_end
   };
   struct GNUNET_SQ_QueryParam ins_params[] = {
-    GNUNET_SQ_query_param_auto_from_type (&query),
-    GNUNET_SQ_query_param_fixed_size (block,
-                                      block_size),
-    GNUNET_SQ_query_param_absolute_time (&expiration),
+    GNUNET_SQ_query_param_auto_from_type(&query),
+    GNUNET_SQ_query_param_fixed_size(block,
+                                     block_size),
+    GNUNET_SQ_query_param_absolute_time(&expiration),
     GNUNET_SQ_query_param_end
   };
   int n;
 
   /* run expiration of old cache entries once per hour */
-  if (GNUNET_TIME_absolute_get_duration (last_expire).rel_value_us >
+  if (GNUNET_TIME_absolute_get_duration(last_expire).rel_value_us >
       GNUNET_TIME_UNIT_HOURS.rel_value_us)
-  {
-    last_expire = GNUNET_TIME_absolute_get ();
-    namecache_sqlite_expire_blocks (plugin);
-  }
-  GNUNET_CRYPTO_hash (&block->derived_key,
-                      sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
-                      &query);
-  expiration = GNUNET_TIME_absolute_ntoh (block->expiration_time);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Caching new version of block %s (expires %s)\n",
-              GNUNET_h2s (&query),
-              GNUNET_STRINGS_absolute_time_to_string (expiration));
+    {
+      last_expire = GNUNET_TIME_absolute_get();
+      namecache_sqlite_expire_blocks(plugin);
+    }
+  GNUNET_CRYPTO_hash(&block->derived_key,
+                     sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey),
+                     &query);
+  expiration = GNUNET_TIME_absolute_ntoh(block->expiration_time);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             "Caching new version of block %s (expires %s)\n",
+             GNUNET_h2s(&query),
+             GNUNET_STRINGS_absolute_time_to_string(expiration));
   if (block_size > 64 * 65536)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
+    {
+      GNUNET_break(0);
+      return GNUNET_SYSERR;
+    }
 
   /* delete old version of the block */
   if (GNUNET_OK !=
-      GNUNET_SQ_bind (plugin->delete_block,
-                      del_params))
-  {
-    LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_bind_XXXX");
-    GNUNET_SQ_reset (plugin->dbh,
-                     plugin->delete_block);
-    return GNUNET_SYSERR;
-  }
-  n = sqlite3_step (plugin->delete_block);
+      GNUNET_SQ_bind(plugin->delete_block,
+                     del_params))
+    {
+      LOG_SQLITE(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_bind_XXXX");
+      GNUNET_SQ_reset(plugin->dbh,
+                      plugin->delete_block);
+      return GNUNET_SYSERR;
+    }
+  n = sqlite3_step(plugin->delete_block);
   switch (n)
-  {
-  case SQLITE_DONE:
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                     "sqlite",
-                     "Old block deleted\n");
-    break;
-  case SQLITE_BUSY:
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_step");
-    break;
-  default:
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_step");
-    break;
-  }
-  GNUNET_SQ_reset (plugin->dbh,
-                   plugin->delete_block);
+    {
+    case SQLITE_DONE:
+      GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG,
+                      "sqlite",
+                      "Old block deleted\n");
+      break;
+
+    case SQLITE_BUSY:
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_step");
+      break;
+
+    default:
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_step");
+      break;
+    }
+  GNUNET_SQ_reset(plugin->dbh,
+                  plugin->delete_block);
 
   /* insert new version of the block */
   if (GNUNET_OK !=
-      GNUNET_SQ_bind (plugin->cache_block,
-                      ins_params))
-  {
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_bind_XXXX");
-    GNUNET_SQ_reset (plugin->dbh,
-                     plugin->cache_block);
-    return GNUNET_SYSERR;
-
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Caching block under derived key `%s'\n",
-              GNUNET_h2s_full (&query));
-  n = sqlite3_step (plugin->cache_block);
-  GNUNET_SQ_reset (plugin->dbh,
-                   plugin->cache_block);
+      GNUNET_SQ_bind(plugin->cache_block,
+                     ins_params))
+    {
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_bind_XXXX");
+      GNUNET_SQ_reset(plugin->dbh,
+                      plugin->cache_block);
+      return GNUNET_SYSERR;
+    }
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Caching block under derived key `%s'\n",
+             GNUNET_h2s_full(&query));
+  n = sqlite3_step(plugin->cache_block);
+  GNUNET_SQ_reset(plugin->dbh,
+                  plugin->cache_block);
   switch (n)
-  {
-  case SQLITE_DONE:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Record stored\n");
-    return GNUNET_OK;
-  case SQLITE_BUSY:
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_step");
-    return GNUNET_NO;
-  default:
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_step");
-    return GNUNET_SYSERR;
-  }
+    {
+    case SQLITE_DONE:
+      LOG(GNUNET_ERROR_TYPE_DEBUG,
+          "Record stored\n");
+      return GNUNET_OK;
+
+    case SQLITE_BUSY:
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_step");
+      return GNUNET_NO;
+
+    default:
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_step");
+      return GNUNET_SYSERR;
+    }
 }
 
 
@@ -443,10 +445,10 @@ namecache_sqlite_cache_block (void *cls,
  * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
  */
 static int
-namecache_sqlite_lookup_block (void *cls,
-                               const struct GNUNET_HashCode *query,
-                               GNUNET_NAMECACHE_BlockCallback iter,
-                               void *iter_cls)
+namecache_sqlite_lookup_block(void *cls,
+                              const struct GNUNET_HashCode *query,
+                              GNUNET_NAMECACHE_BlockCallback iter,
+                              void *iter_cls)
 {
   struct Plugin *plugin = cls;
   int ret;
@@ -454,75 +456,75 @@ namecache_sqlite_lookup_block (void *cls,
   size_t block_size;
   const struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_SQ_QueryParam params[] = {
-    GNUNET_SQ_query_param_auto_from_type (query),
+    GNUNET_SQ_query_param_auto_from_type(query),
     GNUNET_SQ_query_param_end
   };
   struct GNUNET_SQ_ResultSpec rs[] = {
-    GNUNET_SQ_result_spec_variable_size ((void **) &block,
-                                         &block_size),
+    GNUNET_SQ_result_spec_variable_size((void **)&block,
+                                        &block_size),
     GNUNET_SQ_result_spec_end
   };
 
   if (GNUNET_OK !=
-      GNUNET_SQ_bind (plugin->lookup_block,
-                      params))
-  {
-    LOG_SQLITE (plugin,
-                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "sqlite3_bind_XXXX");
-    GNUNET_SQ_reset (plugin->dbh,
-                     plugin->lookup_block);
-    return GNUNET_SYSERR;
-  }
-  ret = GNUNET_NO;
-  if (SQLITE_ROW ==
-      (sret = sqlite3_step (plugin->lookup_block)))
-  {
-    if (GNUNET_OK !=
-        GNUNET_SQ_extract_result (plugin->lookup_block,
-                                  rs))
+      GNUNET_SQ_bind(plugin->lookup_block,
+                     params))
     {
-      GNUNET_break (0);
-      ret = GNUNET_SYSERR;
-    }
-    else if ( (block_size < sizeof (struct GNUNET_GNSRECORD_Block)) ||
-              (ntohl (block->purpose.size) +
-               sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
-               sizeof (struct GNUNET_CRYPTO_EcdsaSignature) != block_size) )
-    {
-      GNUNET_break (0);
-      GNUNET_SQ_cleanup_result (rs);
-      ret = GNUNET_SYSERR;
+      LOG_SQLITE(plugin,
+                 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                 "sqlite3_bind_XXXX");
+      GNUNET_SQ_reset(plugin->dbh,
+                      plugin->lookup_block);
+      return GNUNET_SYSERR;
     }
-    else
+  ret = GNUNET_NO;
+  if (SQLITE_ROW ==
+      (sret = sqlite3_step(plugin->lookup_block)))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Found block under derived key `%s'\n",
-                  GNUNET_h2s_full (query));
-      iter (iter_cls,
-            block);
-      GNUNET_SQ_cleanup_result (rs);
-      ret = GNUNET_YES;
+      if (GNUNET_OK !=
+          GNUNET_SQ_extract_result(plugin->lookup_block,
+                                   rs))
+        {
+          GNUNET_break(0);
+          ret = GNUNET_SYSERR;
+        }
+      else if ((block_size < sizeof(struct GNUNET_GNSRECORD_Block)) ||
+               (ntohl(block->purpose.size) +
+                sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) +
+                sizeof(struct GNUNET_CRYPTO_EcdsaSignature) != block_size))
+        {
+          GNUNET_break(0);
+          GNUNET_SQ_cleanup_result(rs);
+          ret = GNUNET_SYSERR;
+        }
+      else
+        {
+          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                     "Found block under derived key `%s'\n",
+                     GNUNET_h2s_full(query));
+          iter(iter_cls,
+               block);
+          GNUNET_SQ_cleanup_result(rs);
+          ret = GNUNET_YES;
+        }
     }
-  }
   else
-  {
-    if (SQLITE_DONE != sret)
-    {
-      LOG_SQLITE (plugin,
-                  GNUNET_ERROR_TYPE_ERROR,
-                  "sqlite_step");
-      ret = GNUNET_SYSERR;
-    }
-    else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "No block found under derived key `%s'\n",
-                  GNUNET_h2s_full (query));
+      if (SQLITE_DONE != sret)
+        {
+          LOG_SQLITE(plugin,
+                     GNUNET_ERROR_TYPE_ERROR,
+                     "sqlite_step");
+          ret = GNUNET_SYSERR;
+        }
+      else
+        {
+          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                     "No block found under derived key `%s'\n",
+                     GNUNET_h2s_full(query));
+        }
     }
-  }
-  GNUNET_SQ_reset (plugin->dbh,
-                   plugin->lookup_block);
+  GNUNET_SQ_reset(plugin->dbh,
+                  plugin->lookup_block);
   return ret;
 }
 
@@ -534,7 +536,7 @@ namecache_sqlite_lookup_block (void *cls,
  * @return NULL on error, otherwise the plugin context
  */
 void *
-libgnunet_plugin_namecache_sqlite_init (void *cls)
+libgnunet_plugin_namecache_sqlite_init(void *cls)
 {
   static struct Plugin plugin;
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
@@ -542,19 +544,19 @@ libgnunet_plugin_namecache_sqlite_init (void *cls)
 
   if (NULL != plugin.cfg)
     return NULL;                /* can only initialize once! */
-  memset (&plugin, 0, sizeof (struct Plugin));
+  memset(&plugin, 0, sizeof(struct Plugin));
   plugin.cfg = cfg;
-  if (GNUNET_OK != database_setup (&plugin))
-  {
-    database_shutdown (&plugin);
-    return NULL;
-  }
-  api = GNUNET_new (struct GNUNET_NAMECACHE_PluginFunctions);
+  if (GNUNET_OK != database_setup(&plugin))
+    {
+      database_shutdown(&plugin);
+      return NULL;
+    }
+  api = GNUNET_new(struct GNUNET_NAMECACHE_PluginFunctions);
   api->cls = &plugin;
   api->cache_block = &namecache_sqlite_cache_block;
   api->lookup_block = &namecache_sqlite_lookup_block;
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       _("Sqlite database running\n"));
+  LOG(GNUNET_ERROR_TYPE_INFO,
+      _("Sqlite database running\n"));
   return api;
 }
 
@@ -566,16 +568,16 @@ libgnunet_plugin_namecache_sqlite_init (void *cls)
  * @return always NULL
  */
 void *
-libgnunet_plugin_namecache_sqlite_done (void *cls)
+libgnunet_plugin_namecache_sqlite_done(void *cls)
 {
   struct GNUNET_NAMECACHE_PluginFunctions *api = cls;
   struct Plugin *plugin = api->cls;
 
-  database_shutdown (plugin);
+  database_shutdown(plugin);
   plugin->cfg = NULL;
-  GNUNET_free (api);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "sqlite plugin is finished\n");
+  GNUNET_free(api);
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "sqlite plugin is finished\n");
   return NULL;
 }