1 files changed, 86 insertions, 84 deletions

diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index deba91a0c..335496119 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -31,7 +31,8 @@
 /**
  * How often do we at most PUT content into the DHT?
  */
-#define MAX_DHT_PUT_FREQ GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5)
+#define MAX_DHT_PUT_FREQ GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_SECONDS, 5)
 
 /**
  * How many replicas do we try to create per PUT?
@@ -42,7 +43,8 @@
 /**
  * Context for each zero-anonymity iterator.
  */
-struct PutOperator {
+struct PutOperator
+{
   /**
    * Request to datastore for DHT PUTs (or NULL).
    */
@@ -61,7 +63,7 @@ struct PutOperator {
   /**
    * ID of task that collects blocks for DHT PUTs.
    */
-  struct GNUNET_SCHEDULER_Task * dht_task;
+  struct GNUNET_SCHEDULER_Task *dht_task;
 
   /**
    * How many entires with zero anonymity of our type do we currently
@@ -98,7 +100,7 @@ static struct PutOperator operators[] = {
  * @param tc scheduler context (unused)
  */
 static void
-gather_dht_put_blocks(void *cls);
+gather_dht_put_blocks (void *cls);
 
 
 /**
@@ -107,25 +109,25 @@ gather_dht_put_blocks(void *cls);
  * @param po put operator to schedule
  */
 static void
-schedule_next_put(struct PutOperator *po)
+schedule_next_put (struct PutOperator *po)
 {
   struct GNUNET_TIME_Relative delay;
 
   if (po->zero_anonymity_count_estimate > 0)
-    {
-      delay =
-        GNUNET_TIME_relative_divide(GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY,
-                                    po->zero_anonymity_count_estimate);
-      delay = GNUNET_TIME_relative_min(delay, MAX_DHT_PUT_FREQ);
-    }
+  {
+    delay =
+      GNUNET_TIME_relative_divide (GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY,
+                                   po->zero_anonymity_count_estimate);
+    delay = GNUNET_TIME_relative_min (delay, MAX_DHT_PUT_FREQ);
+  }
   else
-    {
-      /* if we have NO zero-anonymity content yet, wait 5 minutes for some to
-       * (hopefully) appear */
-      delay = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5);
-    }
+  {
+    /* if we have NO zero-anonymity content yet, wait 5 minutes for some to
+     * (hopefully) appear */
+    delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5);
+  }
   po->dht_task =
-    GNUNET_SCHEDULER_add_delayed(delay, &gather_dht_put_blocks, po);
+    GNUNET_SCHEDULER_add_delayed (delay, &gather_dht_put_blocks, po);
 }
 
 
@@ -135,12 +137,12 @@ schedule_next_put(struct PutOperator *po)
  * @param cls type of blocks to gather
  */
 static void
-delay_dht_put_blocks(void *cls)
+delay_dht_put_blocks (void *cls)
 {
   struct PutOperator *po = cls;
 
   po->dht_put = NULL;
-  schedule_next_put(po);
+  schedule_next_put (po);
 }
 
 
@@ -150,12 +152,12 @@ delay_dht_put_blocks(void *cls)
  * @param cls type of blocks to gather
  */
 static void
-delay_dht_put_task(void *cls)
+delay_dht_put_task (void *cls)
 {
   struct PutOperator *po = cls;
 
   po->dht_task = NULL;
-  schedule_next_put(po);
+  schedule_next_put (po);
 }
 
 
@@ -175,45 +177,45 @@ delay_dht_put_task(void *cls)
  *        maybe 0 if no unique identifier is available
  */
 static void
-process_dht_put_content(void *cls,
-                        const struct GNUNET_HashCode * key,
-                        size_t size,
-                        const void *data,
-                        enum GNUNET_BLOCK_Type type,
-                        uint32_t priority,
-                        uint32_t anonymity,
-                        uint32_t replication,
-                        struct GNUNET_TIME_Absolute expiration,
-                        uint64_t uid)
+process_dht_put_content (void *cls,
+                         const struct GNUNET_HashCode *key,
+                         size_t size,
+                         const void *data,
+                         enum GNUNET_BLOCK_Type type,
+                         uint32_t priority,
+                         uint32_t anonymity,
+                         uint32_t replication,
+                         struct GNUNET_TIME_Absolute expiration,
+                         uint64_t uid)
 {
   struct PutOperator *po = cls;
 
   po->dht_qe = NULL;
   if (key == NULL)
-    {
-      po->zero_anonymity_count_estimate = po->result_count;
-      po->result_count = 0;
-      po->next_uid = 0;
-      po->dht_task = GNUNET_SCHEDULER_add_now(&delay_dht_put_task, po);
-      return;
-    }
+  {
+    po->zero_anonymity_count_estimate = po->result_count;
+    po->result_count = 0;
+    po->next_uid = 0;
+    po->dht_task = GNUNET_SCHEDULER_add_now (&delay_dht_put_task, po);
+    return;
+  }
   po->result_count++;
   po->next_uid = uid + 1;
   po->zero_anonymity_count_estimate =
-    GNUNET_MAX(po->result_count, po->zero_anonymity_count_estimate);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Retrieved block `%s' of type %u for DHT PUT\n", GNUNET_h2s(key),
-             type);
-  po->dht_put = GNUNET_DHT_put(GSF_dht,
-                               key,
-                               DEFAULT_PUT_REPLICATION,
-                               GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
-                               type,
-                               size,
-                               data,
-                               expiration,
-                               &delay_dht_put_blocks,
-                               po);
+    GNUNET_MAX (po->result_count, po->zero_anonymity_count_estimate);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Retrieved block `%s' of type %u for DHT PUT\n", GNUNET_h2s (key),
+              type);
+  po->dht_put = GNUNET_DHT_put (GSF_dht,
+                                key,
+                                DEFAULT_PUT_REPLICATION,
+                                GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+                                type,
+                                size,
+                                data,
+                                expiration,
+                                &delay_dht_put_blocks,
+                                po);
 }
 
 
@@ -223,21 +225,21 @@ process_dht_put_content(void *cls,
  * @param cls type of blocks to gather
  */
 static void
-gather_dht_put_blocks(void *cls)
+gather_dht_put_blocks (void *cls)
 {
   struct PutOperator *po = cls;
 
   po->dht_task = NULL;
   po->dht_qe =
-    GNUNET_DATASTORE_get_zero_anonymity(GSF_dsh,
-                                        po->next_uid,
-                                        0,
-                                        UINT_MAX,
-                                        po->dht_put_type,
-                                        &process_dht_put_content,
-                                        po);
+    GNUNET_DATASTORE_get_zero_anonymity (GSF_dsh,
+                                         po->next_uid,
+                                         0,
+                                         UINT_MAX,
+                                         po->dht_put_type,
+                                         &process_dht_put_content,
+                                         po);
   if (NULL == po->dht_qe)
-    po->dht_task = GNUNET_SCHEDULER_add_now(&delay_dht_put_task, po);
+    po->dht_task = GNUNET_SCHEDULER_add_now (&delay_dht_put_task, po);
 }
 
 
@@ -245,17 +247,17 @@ gather_dht_put_blocks(void *cls)
  * Setup the module.
  */
 void
-GSF_put_init_()
+GSF_put_init_ ()
 {
   unsigned int i;
 
   i = 0;
   while (operators[i].dht_put_type != GNUNET_BLOCK_TYPE_ANY)
-    {
-      operators[i].dht_task =
-        GNUNET_SCHEDULER_add_now(&gather_dht_put_blocks, &operators[i]);
-      i++;
-    }
+  {
+    operators[i].dht_task =
+      GNUNET_SCHEDULER_add_now (&gather_dht_put_blocks, &operators[i]);
+    i++;
+  }
 }
 
 
@@ -263,31 +265,31 @@ GSF_put_init_()
  * Shutdown the module.
  */
 void
-GSF_put_done_()
+GSF_put_done_ ()
 {
   struct PutOperator *po;
   unsigned int i;
 
   i = 0;
   while ((po = &operators[i])->dht_put_type != GNUNET_BLOCK_TYPE_ANY)
+  {
+    if (NULL != po->dht_task)
+    {
+      GNUNET_SCHEDULER_cancel (po->dht_task);
+      po->dht_task = NULL;
+    }
+    if (NULL != po->dht_put)
+    {
+      GNUNET_DHT_put_cancel (po->dht_put);
+      po->dht_put = NULL;
+    }
+    if (NULL != po->dht_qe)
     {
-      if (NULL != po->dht_task)
-        {
-          GNUNET_SCHEDULER_cancel(po->dht_task);
-          po->dht_task = NULL;
-        }
-      if (NULL != po->dht_put)
-        {
-          GNUNET_DHT_put_cancel(po->dht_put);
-          po->dht_put = NULL;
-        }
-      if (NULL != po->dht_qe)
-        {
-          GNUNET_DATASTORE_cancel(po->dht_qe);
-          po->dht_qe = NULL;
-        }
-      i++;
+      GNUNET_DATASTORE_cancel (po->dht_qe);
+      po->dht_qe = NULL;
     }
+    i++;
+  }
 }
 
 /* end of gnunet-service-fs_put.c */