[GNUnet-SVN] r36574 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2015-10-26 00:09:35 +0100 (Mon, 26 Oct 2015)
New Revision: 36574

Modified:
   gnunet/src/fs/gnunet-service-fs_cp.c
   gnunet/src/fs/gnunet-service-fs_pe.c
   gnunet/src/fs/gnunet-service-fs_pr.c
Log:
-indent

Modified: gnunet/src/fs/gnunet-service-fs_cp.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cp.c        2015-10-25 23:04:09 UTC (rev 
36573)
+++ gnunet/src/fs/gnunet-service-fs_cp.c        2015-10-25 23:09:35 UTC (rev 
36574)
@@ -1495,7 +1495,8 @@
     GNUNET_assert (0 < cp->ppd.pending_queries--);
   else if (GNUNET_NO == pth->is_query)
     GNUNET_assert (0 < cp->ppd.pending_replies--);
-  GNUNET_LOAD_update (cp->ppd.transmission_delay, UINT64_MAX);
+  GNUNET_LOAD_update (cp->ppd.transmission_delay,
+                      UINT64_MAX);
   if (NULL != cp->cth)
   {
     GNUNET_CORE_notify_transmit_ready_cancel (cp->cth);

Modified: gnunet/src/fs/gnunet-service-fs_pe.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pe.c        2015-10-25 23:04:09 UTC (rev 
36573)
+++ gnunet/src/fs/gnunet-service-fs_pe.c        2015-10-25 23:09:35 UTC (rev 
36574)
@@ -614,10 +614,11 @@
   }
   mpc.merged = GNUNET_NO;
   mpc.pr = pr;
+  prd = GSF_pending_request_get_data_ (pr);
   GNUNET_CONTAINER_multihashmap_get_multiple (pp->plan_map,
-                                              &GSF_pending_request_get_data_
-                                              (pr)->query,
-                                              &merge_pr, &mpc);
+                                              &prd->query,
+                                              &merge_pr,
+                                              &mpc);
   if (GNUNET_NO != mpc.merged)
     return;
   plan_count++;
@@ -625,7 +626,6 @@
                             gettext_noop ("# query plan entries"),
                             1,
                             GNUNET_NO);
-  prd = GSF_pending_request_get_data_ (pr);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Planning transmission of query `%s' to peer `%s'\n",
               GNUNET_h2s (&prd->query),
@@ -648,7 +648,8 @@
                                                     get_rp_key (rp),
                                                     rp,
                                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-  plan (pp, rp);
+  plan (pp,
+        rp);
 }
 
 

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2015-10-25 23:04:09 UTC (rev 
36573)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2015-10-25 23:09:35 UTC (rev 
36574)
@@ -431,7 +431,6 @@
 }
 
 
-
 /**
  * Update a given pending request with additional replies
  * that have been seen.
@@ -468,9 +467,11 @@
       /* we're not the initiator, but the initiator did not give us
        * any bloom-filter, so we need to create one on-the-fly */
       pr->mingle =
-          GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX);
+          GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                    UINT32_MAX);
       pr->bf =
-          GNUNET_BLOCK_construct_bloomfilter (pr->mingle, replies_seen,
+          GNUNET_BLOCK_construct_bloomfilter (pr->mingle,
+                                              replies_seen,
                                               replies_seen_count);
     }
     else
@@ -477,8 +478,11 @@
     {
       for (i = 0; i < pr->replies_seen_count; i++)
       {
-        GNUNET_BLOCK_mingle_hash (&replies_seen[i], pr->mingle, &mhash);
-        GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
+        GNUNET_BLOCK_mingle_hash (&replies_seen[i],
+                                  pr->mingle,
+                                  &mhash);
+        GNUNET_CONTAINER_bloomfilter_add (pr->bf,
+                                          &mhash);
       }
     }
   }
@@ -517,7 +521,8 @@
   if (buf_size > 0)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Building request message for `%s' of type %d\n",
-                GNUNET_h2s (&pr->public_data.query), pr->public_data.type);
+                GNUNET_h2s (&pr->public_data.query),
+                pr->public_data.type);
   k = 0;
   bm = 0;
   do_route = (0 == (pr->public_data.options & GSF_PRO_FORWARD_ONLY));
@@ -587,7 +592,9 @@
  * @return #GNUNET_YES (we should continue to iterate)
  */
 static int
-clean_request (void *cls, const struct GNUNET_HashCode *key, void *value)
+clean_request (void *cls,
+               const struct GNUNET_HashCode *key,
+               void *value)
 {
   struct GSF_PendingRequest *pr = value;
   GSF_LocalLookupContinuation cont;
@@ -711,7 +718,7 @@
  * Iterate over all pending requests.
  *
  * @param it function to call for each request
- * @param cls closure for it
+ * @param cls closure for @a it
  */
 void
 GSF_iterate_pending_requests_ (GSF_PendingRequestIterator it, void *cls)
@@ -1272,11 +1279,12 @@
 /**
  * Task that issues a warning if the datastore lookup takes too long.
  *
- * @param cls the 'struct GSF_PendingRequest'
+ * @param cls the `struct GSF_PendingRequest`
  * @param tc task context
  */
 static void
-warn_delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+warn_delay_task (void *cls,
+                 const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GSF_PendingRequest *pr = cls;
 
@@ -1294,11 +1302,12 @@
 /**
  * Task that issues a warning if the datastore lookup takes too long.
  *
- * @param cls the 'struct GSF_PendingRequest'
+ * @param cls the `struct GSF_PendingRequest`
  * @param tc task context
  */
 static void
-odc_warn_delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+odc_warn_delay_task (void *cls,
+                     const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GSF_PendingRequest *pr = cls;
 
@@ -1489,7 +1498,7 @@
                                   /* max queue size */ ,
                                   GNUNET_TIME_UNIT_FOREVER_REL,
                                   &process_local_reply, pr);
-    if (pr->qe == NULL)
+    if (NULL == pr->qe)
     {
       GNUNET_STATISTICS_update (GSF_stats,
                                 gettext_noop