From fb6e2fdd289b77acb7b9f9726f9a1e1c79a22103 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 29 Aug 2020 23:30:01 +0200
Subject: -mild refactoring of consensus, cleaning up the code a bit

---
 src/consensus/gnunet-service-consensus.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/consensus')

diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 24e285e77..587e3685f 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -17,13 +17,11 @@
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
-
 /**
  * @file consensus/gnunet-service-consensus.c
  * @brief multi-peer set reconciliation
  * @author Florian Dold <flo@dold.me>
  */
-
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
@@ -1012,7 +1010,8 @@ set_result_cb (void *cls,
 
   if (SET_KIND_NONE != setop->output_set.set_kind)
   {
-    output_set = lookup_set (session, &setop->output_set);
+    output_set = lookup_set (session,
+                             &setop->output_set);
     GNUNET_assert (NULL != output_set);
   }
 
@@ -2194,7 +2193,9 @@ task_start_reconcile (struct TaskEntry *task)
        we clone the input set. */
     if (NULL == lookup_set (session, &setop->output_set))
     {
-      create_set_copy_for_task (task, &setop->input_set, &setop->output_set);
+      create_set_copy_for_task (task,
+                                &setop->input_set,
+                                &setop->output_set);
       return;
     }
   }
@@ -2318,7 +2319,9 @@ task_start_eval_echo (struct TaskEntry *task)
   output_set = lookup_set (session, &sk_out);
   if (NULL == output_set)
   {
-    create_set_copy_for_task (task, &sk_in, &sk_out);
+    create_set_copy_for_task (task,
+                              &sk_in,
+                              &sk_out);
     return;
   }
 
@@ -2326,6 +2329,7 @@ task_start_eval_echo (struct TaskEntry *task)
     // FIXME: should be marked as a shallow copy, so
     // we can destroy everything correctly
     struct SetEntry *last_set = GNUNET_new (struct SetEntry);
+
     last_set->h = output_set->h;
     last_set->key = (struct SetKey) { SET_KIND_LAST_GRADECAST };
     put_set (session, last_set);
@@ -2719,7 +2723,7 @@ set_listen_cb (void *cls,
   task->cls.setop.op = GNUNET_SET_accept (request,
                                           GNUNET_SET_RESULT_SYMMETRIC,
                                           opts,
-                                          set_result_cb,
+                                          &set_result_cb,
                                           task);
 
   /* If the task hasn't been started yet,
-- 
cgit v1.2.3