1 files changed, 167 insertions, 166 deletions

diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index 52c755a49..1ae228b86 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -29,15 +29,16 @@
 #include "gnunet_datacache_plugin.h"
 
 
-#define LOG(kind, ...) GNUNET_log_from(kind, "datacache", __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from (kind, "datacache", __VA_ARGS__)
 
 #define LOG_STRERROR_FILE(kind, op, fn) \
-  GNUNET_log_from_strerror_file(kind, "datacache", op, fn)
+  GNUNET_log_from_strerror_file (kind, "datacache", op, fn)
 
 /**
  * Internal state of the datacache library.
  */
-struct GNUNET_DATACACHE_Handle {
+struct GNUNET_DATACACHE_Handle
+{
   /**
    * Bloomfilter to quickly tell if we don't have the content.
    */
@@ -100,24 +101,24 @@ struct GNUNET_DATACACHE_Handle {
  * @param size number of bytes that were made available
  */
 static void
-env_delete_notify(void *cls, const struct GNUNET_HashCode *key, size_t size)
+env_delete_notify (void *cls, const struct GNUNET_HashCode *key, size_t size)
 {
   struct GNUNET_DATACACHE_Handle *h = cls;
 
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Content under key `%s' discarded\n",
-      GNUNET_h2s(key));
-  GNUNET_assert(h->utilization >= size);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Content under key `%s' discarded\n",
+       GNUNET_h2s (key));
+  GNUNET_assert (h->utilization >= size);
   h->utilization -= size;
-  GNUNET_CONTAINER_bloomfilter_remove(h->filter, key);
-  GNUNET_STATISTICS_update(h->stats,
-                           gettext_noop("# bytes stored"),
-                           -(long long)size,
-                           GNUNET_NO);
-  GNUNET_STATISTICS_update(h->stats,
-                           gettext_noop("# items stored"),
-                           -1,
-                           GNUNET_NO);
+  GNUNET_CONTAINER_bloomfilter_remove (h->filter, key);
+  GNUNET_STATISTICS_update (h->stats,
+                            gettext_noop ("# bytes stored"),
+                            -(long long) size,
+                            GNUNET_NO);
+  GNUNET_STATISTICS_update (h->stats,
+                            gettext_noop ("# items stored"),
+                            -1,
+                            GNUNET_NO);
 }
 
 
@@ -129,8 +130,8 @@ env_delete_notify(void *cls, const struct GNUNET_HashCode *key, size_t size)
  * @return handle to use to access the service
  */
 struct GNUNET_DATACACHE_Handle *
-GNUNET_DATACACHE_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
-                        const char *section)
+GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                         const char *section)
 {
   unsigned int bf_size;
   unsigned long long quota;
@@ -139,65 +140,65 @@ GNUNET_DATACACHE_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
   char *name;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_size(cfg, section, "QUOTA", &quota))
-    {
-      GNUNET_log_config_missing(GNUNET_ERROR_TYPE_ERROR, section, "QUOTA");
-      return NULL;
-    }
+      GNUNET_CONFIGURATION_get_value_size (cfg, section, "QUOTA", &quota))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, section, "QUOTA");
+    return NULL;
+  }
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string(cfg, section, "DATABASE", &name))
-    {
-      GNUNET_log_config_missing(GNUNET_ERROR_TYPE_ERROR, section, "DATABASE");
-      return NULL;
-    }
+      GNUNET_CONFIGURATION_get_value_string (cfg, section, "DATABASE", &name))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, section, "DATABASE");
+    return NULL;
+  }
   bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */
 
-  ret = GNUNET_new(struct GNUNET_DATACACHE_Handle);
+  ret = GNUNET_new (struct GNUNET_DATACACHE_Handle);
 
   if (GNUNET_YES !=
-      GNUNET_CONFIGURATION_get_value_yesno(cfg, section, "DISABLE_BF"))
+      GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "DISABLE_BF"))
+  {
+    if (GNUNET_YES !=
+        GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "DISABLE_BF_RC"))
+    {
+      ret->bloom_name = GNUNET_DISK_mktemp ("gnunet-datacachebloom");
+    }
+    if (NULL != ret->bloom_name)
+    {
+      ret->filter = GNUNET_CONTAINER_bloomfilter_load (
+        ret->bloom_name,
+        quota / 1024,     /* 8 bit per entry in DB, expect 1k entries */
+        5);
+    }
+    if (NULL == ret->filter)
     {
-      if (GNUNET_YES !=
-          GNUNET_CONFIGURATION_get_value_yesno(cfg, section, "DISABLE_BF_RC"))
-        {
-          ret->bloom_name = GNUNET_DISK_mktemp("gnunet-datacachebloom");
-        }
-      if (NULL != ret->bloom_name)
-        {
-          ret->filter = GNUNET_CONTAINER_bloomfilter_load(
-            ret->bloom_name,
-            quota / 1024, /* 8 bit per entry in DB, expect 1k entries */
-            5);
-        }
-      if (NULL == ret->filter)
-        {
-          ret->filter =
-            GNUNET_CONTAINER_bloomfilter_init(NULL,
-                                              bf_size,
-                                              5); /* approx. 3% false positives at max use */
-        }
+      ret->filter =
+        GNUNET_CONTAINER_bloomfilter_init (NULL,
+                                           bf_size,
+                                           5);    /* approx. 3% false positives at max use */
     }
-  ret->stats = GNUNET_STATISTICS_create("datacache", cfg);
-  ret->section = GNUNET_strdup(section);
+  }
+  ret->stats = GNUNET_STATISTICS_create ("datacache", cfg);
+  ret->section = GNUNET_strdup (section);
   ret->env.cfg = cfg;
   ret->env.delete_notify = &env_delete_notify;
   ret->env.section = ret->section;
   ret->env.cls = ret;
   ret->env.delete_notify = &env_delete_notify;
   ret->env.quota = quota;
-  LOG(GNUNET_ERROR_TYPE_INFO, _("Loading `%s' datacache plugin\n"), name);
-  GNUNET_asprintf(&libname, "libgnunet_plugin_datacache_%s", name);
+  LOG (GNUNET_ERROR_TYPE_INFO, _ ("Loading `%s' datacache plugin\n"), name);
+  GNUNET_asprintf (&libname, "libgnunet_plugin_datacache_%s", name);
   ret->short_name = name;
   ret->lib_name = libname;
-  ret->api = GNUNET_PLUGIN_load(libname, &ret->env);
+  ret->api = GNUNET_PLUGIN_load (libname, &ret->env);
   if (ret->api == NULL)
-    {
-      LOG(GNUNET_ERROR_TYPE_ERROR,
-          _("Failed to load datacache plugin for `%s'\n"),
-          name);
-      GNUNET_DATACACHE_destroy(ret);
-      return NULL;
-    }
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _ ("Failed to load datacache plugin for `%s'\n"),
+         name);
+    GNUNET_DATACACHE_destroy (ret);
+    return NULL;
+  }
   return ret;
 }
 
@@ -208,26 +209,26 @@ GNUNET_DATACACHE_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h handle to the datastore
  */
 void
-GNUNET_DATACACHE_destroy(struct GNUNET_DATACACHE_Handle *h)
+GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h)
 {
   if (NULL != h->filter)
-    GNUNET_CONTAINER_bloomfilter_free(h->filter);
+    GNUNET_CONTAINER_bloomfilter_free (h->filter);
   if (NULL != h->api)
-    GNUNET_break(NULL == GNUNET_PLUGIN_unload(h->lib_name, h->api));
-  GNUNET_free(h->lib_name);
-  GNUNET_free(h->short_name);
-  GNUNET_free(h->section);
+    GNUNET_break (NULL == GNUNET_PLUGIN_unload (h->lib_name, h->api));
+  GNUNET_free (h->lib_name);
+  GNUNET_free (h->short_name);
+  GNUNET_free (h->section);
   if (NULL != h->bloom_name)
-    {
-      if (0 != unlink(h->bloom_name))
-        GNUNET_log_from_strerror_file(GNUNET_ERROR_TYPE_WARNING,
-                                      "datacache",
-                                      "unlink",
-                                      h->bloom_name);
-      GNUNET_free(h->bloom_name);
-    }
-  GNUNET_STATISTICS_destroy(h->stats, GNUNET_NO);
-  GNUNET_free(h);
+  {
+    if (0 != unlink (h->bloom_name))
+      GNUNET_log_from_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                     "datacache",
+                                     "unlink",
+                                     h->bloom_name);
+    GNUNET_free (h->bloom_name);
+  }
+  GNUNET_STATISTICS_destroy (h->stats, GNUNET_NO);
+  GNUNET_free (h);
 }
 
 
@@ -246,52 +247,52 @@ GNUNET_DATACACHE_destroy(struct GNUNET_DATACACHE_Handle *h)
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error, #GNUNET_NO if duplicate
  */
 int
-GNUNET_DATACACHE_put(struct GNUNET_DATACACHE_Handle *h,
-                     const struct GNUNET_HashCode *key,
-                     uint32_t xor_distance,
-                     size_t data_size,
-                     const char *data,
-                     enum GNUNET_BLOCK_Type type,
-                     struct GNUNET_TIME_Absolute discard_time,
-                     unsigned int path_info_len,
-                     const struct GNUNET_PeerIdentity *path_info)
+GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
+                      const struct GNUNET_HashCode *key,
+                      uint32_t xor_distance,
+                      size_t data_size,
+                      const char *data,
+                      enum GNUNET_BLOCK_Type type,
+                      struct GNUNET_TIME_Absolute discard_time,
+                      unsigned int path_info_len,
+                      const struct GNUNET_PeerIdentity *path_info)
 {
   ssize_t used;
 
-  used = h->api->put(h->api->cls,
-                     key,
-                     xor_distance,
-                     data_size,
-                     data,
-                     type,
-                     discard_time,
-                     path_info_len,
-                     path_info);
+  used = h->api->put (h->api->cls,
+                      key,
+                      xor_distance,
+                      data_size,
+                      data,
+                      type,
+                      discard_time,
+                      path_info_len,
+                      path_info);
   if (-1 == used)
-    {
-      GNUNET_break(0);
-      return GNUNET_SYSERR;
-    }
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   if (0 == used)
-    {
-      /* duplicate */
-      return GNUNET_NO;
-    }
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Stored data under key `%s' in cache\n",
-      GNUNET_h2s(key));
+  {
+    /* duplicate */
+    return GNUNET_NO;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Stored data under key `%s' in cache\n",
+       GNUNET_h2s (key));
   if (NULL != h->filter)
-    GNUNET_CONTAINER_bloomfilter_add(h->filter, key);
-  GNUNET_STATISTICS_update(h->stats,
-                           gettext_noop("# bytes stored"),
-                           used,
-                           GNUNET_NO);
-  GNUNET_STATISTICS_update(h->stats,
-                           gettext_noop("# items stored"),
-                           1,
-                           GNUNET_NO);
+    GNUNET_CONTAINER_bloomfilter_add (h->filter, key);
+  GNUNET_STATISTICS_update (h->stats,
+                            gettext_noop ("# bytes stored"),
+                            used,
+                            GNUNET_NO);
+  GNUNET_STATISTICS_update (h->stats,
+                            gettext_noop ("# items stored"),
+                            1,
+                            GNUNET_NO);
   while (h->utilization + used > h->env.quota)
-    GNUNET_assert(GNUNET_OK == h->api->del(h->api->cls));
+    GNUNET_assert (GNUNET_OK == h->api->del (h->api->cls));
   h->utilization += used;
   return GNUNET_OK;
 }
@@ -309,33 +310,33 @@ GNUNET_DATACACHE_put(struct GNUNET_DATACACHE_Handle *h,
  * @return the number of results found
  */
 unsigned int
-GNUNET_DATACACHE_get(struct GNUNET_DATACACHE_Handle *h,
-                     const struct GNUNET_HashCode *key,
-                     enum GNUNET_BLOCK_Type type,
-                     GNUNET_DATACACHE_Iterator iter,
-                     void *iter_cls)
+GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
+                      const struct GNUNET_HashCode *key,
+                      enum GNUNET_BLOCK_Type type,
+                      GNUNET_DATACACHE_Iterator iter,
+                      void *iter_cls)
 {
-  GNUNET_STATISTICS_update(h->stats,
-                           gettext_noop("# requests received"),
-                           1,
-                           GNUNET_NO);
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Processing request for key `%s'\n",
-      GNUNET_h2s(key));
+  GNUNET_STATISTICS_update (h->stats,
+                            gettext_noop ("# requests received"),
+                            1,
+                            GNUNET_NO);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Processing request for key `%s'\n",
+       GNUNET_h2s (key));
   if ((NULL != h->filter) &&
-      (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_test(h->filter, key)))
-    {
-      GNUNET_STATISTICS_update(h->stats,
-                               gettext_noop(
-                                 "# requests filtered by bloom filter"),
-                               1,
-                               GNUNET_NO);
-      LOG(GNUNET_ERROR_TYPE_DEBUG,
-          "Bloomfilter filters request for key `%s'\n",
-          GNUNET_h2s(key));
-      return 0; /* can not be present */
-    }
-  return h->api->get(h->api->cls, key, type, iter, iter_cls);
+      (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_test (h->filter, key)))
+  {
+    GNUNET_STATISTICS_update (h->stats,
+                              gettext_noop (
+                                "# requests filtered by bloom filter"),
+                              1,
+                              GNUNET_NO);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Bloomfilter filters request for key `%s'\n",
+         GNUNET_h2s (key));
+    return 0;   /* can not be present */
+  }
+  return h->api->get (h->api->cls, key, type, iter, iter_cls);
 }
 
 
@@ -348,17 +349,17 @@ GNUNET_DATACACHE_get(struct GNUNET_DATACACHE_Handle *h,
  * @return the number of results found (zero or 1)
  */
 unsigned int
-GNUNET_DATACACHE_get_random(struct GNUNET_DATACACHE_Handle *h,
-                            GNUNET_DATACACHE_Iterator iter,
-                            void *iter_cls)
+GNUNET_DATACACHE_get_random (struct GNUNET_DATACACHE_Handle *h,
+                             GNUNET_DATACACHE_Iterator iter,
+                             void *iter_cls)
 {
-  GNUNET_STATISTICS_update(h->stats,
-                           gettext_noop(
-                             "# requests for random value received"),
-                           1,
-                           GNUNET_NO);
-  LOG(GNUNET_ERROR_TYPE_DEBUG, "Processing request for random value\n");
-  return h->api->get_random(h->api->cls, iter, iter_cls);
+  GNUNET_STATISTICS_update (h->stats,
+                            gettext_noop (
+                              "# requests for random value received"),
+                            1,
+                            GNUNET_NO);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing request for random value\n");
+  return h->api->get_random (h->api->cls, iter, iter_cls);
 }
 
 
@@ -376,21 +377,21 @@ GNUNET_DATACACHE_get_random(struct GNUNET_DATACACHE_Handle *h,
  * @return the number of results found
  */
 unsigned int
-GNUNET_DATACACHE_get_closest(struct GNUNET_DATACACHE_Handle *h,
-                             const struct GNUNET_HashCode *key,
-                             unsigned int num_results,
-                             GNUNET_DATACACHE_Iterator iter,
-                             void *iter_cls)
+GNUNET_DATACACHE_get_closest (struct GNUNET_DATACACHE_Handle *h,
+                              const struct GNUNET_HashCode *key,
+                              unsigned int num_results,
+                              GNUNET_DATACACHE_Iterator iter,
+                              void *iter_cls)
 {
-  GNUNET_STATISTICS_update(h->stats,
-                           gettext_noop(
-                             "# proximity search requests received"),
-                           1,
-                           GNUNET_NO);
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Processing proximity search at `%s'\n",
-      GNUNET_h2s(key));
-  return h->api->get_closest(h->api->cls, key, num_results, iter, iter_cls);
+  GNUNET_STATISTICS_update (h->stats,
+                            gettext_noop (
+                              "# proximity search requests received"),
+                            1,
+                            GNUNET_NO);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Processing proximity search at `%s'\n",
+       GNUNET_h2s (key));
+  return h->api->get_closest (h->api->cls, key, num_results, iter, iter_cls);
 }