1 files changed, 74 insertions, 100 deletions

diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index b937c63bb..a17eb9628 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -70,7 +70,7 @@ struct GNUNET_DATACACHE_Handle
    * Name of the library (i.e. "gnunet_plugin_datacache_sqlite").
    */
   char *lib_name;
-  
+
   /**
    * Name for the bloom filter file.
    */
@@ -97,19 +97,16 @@ struct GNUNET_DATACACHE_Handle
  * @param key key of the content that was deleted
  * @param size number of bytes that were made available
  */
-static void 
-env_delete_notify (void *cls,
-                   const GNUNET_HashCode *key,
-                   size_t size)
+static void
+env_delete_notify (void *cls, const GNUNET_HashCode * key, size_t size)
 {
-  struct GNUNET_DATACACHE_Handle * h = cls;
+  struct GNUNET_DATACACHE_Handle *h = cls;
+
   GNUNET_assert (h->utilization >= size);
   h->utilization -= size;
   GNUNET_CONTAINER_bloomfilter_remove (h->filter, key);
   GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# bytes stored"),
-                            -size,
-                            GNUNET_NO);
+                            gettext_noop ("# bytes stored"), -size, GNUNET_NO);
 }
 
 
@@ -122,7 +119,7 @@ env_delete_notify (void *cls,
  */
 struct GNUNET_DATACACHE_Handle *
 GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                         const char *section)
+                         const char *section)
 {
   unsigned int bf_size;
   unsigned long long quota;
@@ -131,45 +128,38 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
   char *name;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             section, "QUOTA", &quota))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("No `%s' specified for `%s' in configuration!\n"),
-                  "QUOTA",
-                  section);
-      return NULL;
-    }
+      GNUNET_CONFIGURATION_get_value_number (cfg, section, "QUOTA", &quota))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("No `%s' specified for `%s' in configuration!\n"),
+                "QUOTA", section);
+    return NULL;
+  }
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             section,
-                                             "DATABASE", &name))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("No `%s' specified for `%s' in configuration!\n"),
-                  "DATABASE",
-                  section);
-      return NULL;
-    }
-  bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */
-
-  ret = GNUNET_malloc (sizeof(struct GNUNET_DATACACHE_Handle));
+      GNUNET_CONFIGURATION_get_value_string (cfg, section, "DATABASE", &name))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("No `%s' specified for `%s' in configuration!\n"),
+                "DATABASE", section);
+    return NULL;
+  }
+  bf_size = quota / 32;         /* 8 bit per entry, 1 bit per 32 kb in DB */
+
+  ret = GNUNET_malloc (sizeof (struct GNUNET_DATACACHE_Handle));
   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);
-    }
+  {
+    ret->filter = GNUNET_CONTAINER_bloomfilter_load (ret->bloom_name, quota / 1024,     /* 8 bit per entry in DB, expect 1k entries */
+                                                     5);
+  }
   else
-    {
-      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->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->env.cfg = cfg;
-  ret->env.delete_notify = &env_delete_notify;  
+  ret->env.delete_notify = &env_delete_notify;
   ret->env.section = ret->section;
   ret->env.cls = ret;
   ret->env.delete_notify = &env_delete_notify;
@@ -181,12 +171,12 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
   ret->lib_name = libname;
   ret->api = GNUNET_PLUGIN_load (libname, &ret->env);
   if (ret->api == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load datacache plugin for `%s'\n"), name);
-      GNUNET_DATACACHE_destroy (ret);
-      return NULL;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load datacache plugin for `%s'\n"), name);
+    GNUNET_DATACACHE_destroy (ret);
+    return NULL;
+  }
   return ret;
 }
 
@@ -196,7 +186,8 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  *
  * @param h handle to the datastore
  */
-void GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h)
+void
+GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h)
 {
   if (h->filter != NULL)
     GNUNET_CONTAINER_bloomfilter_free (h->filter);
@@ -206,15 +197,13 @@ void GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h)
   GNUNET_free (h->short_name);
   GNUNET_free (h->section);
   if (h->bloom_name != NULL)
-    {
-      if (0 != UNLINK (h->bloom_name))
-        GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-                                  "unlink",
-                                  h->bloom_name);
-      GNUNET_free (h->bloom_name);
-    }
-  GNUNET_STATISTICS_destroy (h->stats,
-                             GNUNET_NO);
+  {
+    if (0 != UNLINK (h->bloom_name))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                "unlink", h->bloom_name);
+    GNUNET_free (h->bloom_name);
+  }
+  GNUNET_STATISTICS_destroy (h->stats, GNUNET_NO);
   GNUNET_free (h);
 }
 
@@ -230,31 +219,24 @@ void GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h)
  * @param discard_time when to discard the value in any case
  * @return GNUNET_OK on success, GNUNET_SYSERR on error (full, etc.)
  */
-int 
+int
 GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
-                      const GNUNET_HashCode * key,
-                      size_t size,
-                      const char *data,
-                      enum GNUNET_BLOCK_Type type,
-                      struct GNUNET_TIME_Absolute discard_time)
+                      const GNUNET_HashCode * key,
+                      size_t size,
+                      const char *data,
+                      enum GNUNET_BLOCK_Type type,
+                      struct GNUNET_TIME_Absolute discard_time)
 {
   uint32_t used;
 
-  used = h->api->put (h->api->cls,
-                      key,
-                      size,
-                      data,
-                      type,
-                      discard_time);
+  used = h->api->put (h->api->cls, key, size, data, type, discard_time);
   if (used == 0)
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   GNUNET_STATISTICS_update (h->stats,
-                            gettext_noop ("# bytes stored"),
-                            size,
-                            GNUNET_NO);
+                            gettext_noop ("# bytes stored"), size, GNUNET_NO);
   GNUNET_CONTAINER_bloomfilter_add (h->filter, key);
   while (h->utilization + used > h->env.quota)
     GNUNET_assert (GNUNET_OK == h->api->del (h->api->cls));
@@ -274,31 +256,23 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
  * @param iter_cls closure for iter
  * @return the number of results found
  */
-unsigned int 
+unsigned int
 GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
-                      const GNUNET_HashCode * key,
-                      enum GNUNET_BLOCK_Type type, 
-                      GNUNET_DATACACHE_Iterator iter,
-                      void *iter_cls)
+                      const 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);
-  if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_test (h->filter,
-                                                      key))
-    {
-      GNUNET_STATISTICS_update (h->stats,
-                                gettext_noop ("# requests filtered by bloom filter"),
-                                1,
-                                GNUNET_NO);
-      return 0; /* can not be present */
-    } 
-  return h->api->get (h->api->cls,
-                      key,
-                      type,
-                      iter,
-                      iter_cls);
+                            gettext_noop ("# requests received"), 1, GNUNET_NO);
+  if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_test (h->filter, key))
+  {
+    GNUNET_STATISTICS_update (h->stats,
+                              gettext_noop
+                              ("# requests filtered by bloom filter"), 1,
+                              GNUNET_NO);
+    return 0;                   /* can not be present */
+  }
+  return h->api->get (h->api->cls, key, type, iter, iter_cls);
 }