1 files changed, 197 insertions, 191 deletions

diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c
index 3f209668d..12ebcb64f 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file set/test_set_intersection_result_full.c
@@ -54,90 +54,96 @@ static struct GNUNET_SET_OperationHandle *oh2;
 
 
 static void
-result_cb_set1 (void *cls,
-                const struct GNUNET_SET_Element *element,
-                uint64_t current_size,
-                enum GNUNET_SET_Status status)
+result_cb_set1(void *cls,
+               const struct GNUNET_SET_Element *element,
+               uint64_t current_size,
+               enum GNUNET_SET_Status status)
 {
   static int count;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Processing result set 1 (%d)\n",
-              status);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             "Processing result set 1 (%d)\n",
+             status);
   switch (status)
-  {
-  case GNUNET_SET_STATUS_OK:
-    count++;
-    break;
-  case GNUNET_SET_STATUS_FAILURE:
-    oh1 = NULL;
-    ret = 1;
-    break;
-  case GNUNET_SET_STATUS_DONE:
-    oh1 = NULL;
-    GNUNET_assert (1 == count);
-    GNUNET_SET_destroy (set1);
-    set1 = NULL;
-    if (NULL == set2)
-      GNUNET_SCHEDULER_shutdown ();
-    break;
-  default:
-    GNUNET_assert (0);
-  }
+    {
+    case GNUNET_SET_STATUS_OK:
+      count++;
+      break;
+
+    case GNUNET_SET_STATUS_FAILURE:
+      oh1 = NULL;
+      ret = 1;
+      break;
+
+    case GNUNET_SET_STATUS_DONE:
+      oh1 = NULL;
+      GNUNET_assert(1 == count);
+      GNUNET_SET_destroy(set1);
+      set1 = NULL;
+      if (NULL == set2)
+        GNUNET_SCHEDULER_shutdown();
+      break;
+
+    default:
+      GNUNET_assert(0);
+    }
 }
 
 
 static void
-result_cb_set2 (void *cls,
-                const struct GNUNET_SET_Element *element,
-                uint64_t current_size,
-                enum GNUNET_SET_Status status)
+result_cb_set2(void *cls,
+               const struct GNUNET_SET_Element *element,
+               uint64_t current_size,
+               enum GNUNET_SET_Status status)
 {
   static int count;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Processing result set 2 (%d)\n",
-              status);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             "Processing result set 2 (%d)\n",
+             status);
   switch (status)
-  {
-  case GNUNET_SET_STATUS_OK:
-    count++;
-    break;
-  case GNUNET_SET_STATUS_FAILURE:
-    oh2 = NULL;
-    ret = 1;
-    break;
-  case GNUNET_SET_STATUS_DONE:
-    oh2 = NULL;
-    GNUNET_assert (1 == count);
-    GNUNET_SET_destroy (set2);
-    set2 = NULL;
-    if (NULL == set1)
-      GNUNET_SCHEDULER_shutdown ();
-    break;
-  default:
-    GNUNET_assert (0);
-  }
+    {
+    case GNUNET_SET_STATUS_OK:
+      count++;
+      break;
+
+    case GNUNET_SET_STATUS_FAILURE:
+      oh2 = NULL;
+      ret = 1;
+      break;
+
+    case GNUNET_SET_STATUS_DONE:
+      oh2 = NULL;
+      GNUNET_assert(1 == count);
+      GNUNET_SET_destroy(set2);
+      set2 = NULL;
+      if (NULL == set1)
+        GNUNET_SCHEDULER_shutdown();
+      break;
+
+    default:
+      GNUNET_assert(0);
+    }
 }
 
 
 static void
-listen_cb (void *cls,
-           const struct GNUNET_PeerIdentity *other_peer,
-           const struct GNUNET_MessageHeader *context_msg,
-           struct GNUNET_SET_Request *request)
+listen_cb(void *cls,
+          const struct GNUNET_PeerIdentity *other_peer,
+          const struct GNUNET_MessageHeader *context_msg,
+          struct GNUNET_SET_Request *request)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "starting intersection by accepting and committing\n");
-  GNUNET_assert (NULL != context_msg);
-  GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_DUMMY);
-  oh2 = GNUNET_SET_accept (request,
-                           GNUNET_SET_RESULT_FULL,
-                           (struct GNUNET_SET_Option[]) { 0 },
-                           &result_cb_set2,
-                           NULL);
-  GNUNET_SET_commit (oh2,
-                     set2);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             "starting intersection by accepting and committing\n");
+  GNUNET_assert(NULL != context_msg);
+  GNUNET_assert(ntohs(context_msg->type) == GNUNET_MESSAGE_TYPE_DUMMY);
+  oh2 = GNUNET_SET_accept(request,
+                          GNUNET_SET_RESULT_FULL,
+                          (struct GNUNET_SET_Option[]) { 0 },
+                          &result_cb_set2,
+                          NULL);
+  GNUNET_SET_commit(oh2,
+                    set2);
 }
 
 
@@ -147,28 +153,28 @@ listen_cb (void *cls,
  * @param cls closure, unused
  */
 static void
-start (void *cls)
+start(void *cls)
 {
   struct GNUNET_MessageHeader context_msg;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "starting listener\n");
-  context_msg.size = htons (sizeof context_msg);
-  context_msg.type = htons (GNUNET_MESSAGE_TYPE_DUMMY);
-  listen_handle = GNUNET_SET_listen (config,
-                                     GNUNET_SET_OPERATION_INTERSECTION,
-                                     &app_id,
-                                     &listen_cb,
-                                     NULL);
-  oh1 = GNUNET_SET_prepare (&local_id,
-                            &app_id,
-                            &context_msg,
-                            GNUNET_SET_RESULT_FULL,
-                            (struct GNUNET_SET_Option[]) { 0 },
-                            &result_cb_set1,
-                            NULL);
-  GNUNET_SET_commit (oh1,
-                     set1);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             "starting listener\n");
+  context_msg.size = htons(sizeof context_msg);
+  context_msg.type = htons(GNUNET_MESSAGE_TYPE_DUMMY);
+  listen_handle = GNUNET_SET_listen(config,
+                                    GNUNET_SET_OPERATION_INTERSECTION,
+                                    &app_id,
+                                    &listen_cb,
+                                    NULL);
+  oh1 = GNUNET_SET_prepare(&local_id,
+                           &app_id,
+                           &context_msg,
+                           GNUNET_SET_RESULT_FULL,
+                           (struct GNUNET_SET_Option[]) { 0 },
+                           &result_cb_set1,
+                           NULL);
+  GNUNET_SET_commit(oh1,
+                    set1);
 }
 
 
@@ -178,31 +184,31 @@ start (void *cls)
  * @param cls closure, unused
  */
 static void
-init_set2 (void *cls)
+init_set2(void *cls)
 {
   struct GNUNET_SET_Element element;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "initializing set 2\n");
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             "initializing set 2\n");
   element.element_type = 0;
   element.data = "hello";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2,
-                          &element,
-                          NULL,
-                          NULL);
+  GNUNET_SET_add_element(set2,
+                         &element,
+                         NULL,
+                         NULL);
   element.data = "quux";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2,
-                          &element,
-                          NULL,
-                          NULL);
+  GNUNET_SET_add_element(set2,
+                         &element,
+                         NULL,
+                         NULL);
   element.data = "baz";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2,
-                          &element,
-                          &start,
-                          NULL);
+  GNUNET_SET_add_element(set2,
+                         &element,
+                         &start,
+                         NULL);
 }
 
 
@@ -210,73 +216,73 @@ init_set2 (void *cls)
  * Initialize the first set, continue.
  */
 static void
-init_set1 (void)
+init_set1(void)
 {
   struct GNUNET_SET_Element element;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "initializing set 1\n");
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             "initializing set 1\n");
   element.element_type = 0;
   element.data = "hello";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set1,
-                          &element,
-                          NULL,
-                          NULL);
+  GNUNET_SET_add_element(set1,
+                         &element,
+                         NULL,
+                         NULL);
   element.data = "bar";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set1,
-                          &element,
-                          &init_set2,
-                          NULL);
+  GNUNET_SET_add_element(set1,
+                         &element,
+                         &init_set2,
+                         NULL);
 }
 
 
 static int
-iter_cb (void *cls,
-         const struct GNUNET_SET_Element *element)
+iter_cb(void *cls,
+        const struct GNUNET_SET_Element *element)
 {
   if (NULL == element)
-  {
-    GNUNET_assert (iter_count == 3);
-    GNUNET_SET_destroy (cls);
-    return GNUNET_YES;
-  }
+    {
+      GNUNET_assert(iter_count == 3);
+      GNUNET_SET_destroy(cls);
+      return GNUNET_YES;
+    }
   iter_count++;
   return GNUNET_YES;
 }
 
 
 static void
-test_iter ()
+test_iter()
 {
   struct GNUNET_SET_Element element;
   struct GNUNET_SET_Handle *iter_set;
 
-  iter_set = GNUNET_SET_create (config,
-                                GNUNET_SET_OPERATION_INTERSECTION);
+  iter_set = GNUNET_SET_create(config,
+                               GNUNET_SET_OPERATION_INTERSECTION);
   element.element_type = 0;
   element.data = "hello";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (iter_set,
-                          &element,
-                          NULL,
-                          NULL);
+  GNUNET_SET_add_element(iter_set,
+                         &element,
+                         NULL,
+                         NULL);
   element.data = "bar";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (iter_set,
-                          &element,
-                          NULL,
-                          NULL);
+  GNUNET_SET_add_element(iter_set,
+                         &element,
+                         NULL,
+                         NULL);
   element.data = "quux";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (iter_set,
-                          &element,
-                          NULL,
-                          NULL);
-  GNUNET_SET_iterate (iter_set,
-                      &iter_cb,
-                      iter_set);
+  GNUNET_SET_add_element(iter_set,
+                         &element,
+                         NULL,
+                         NULL);
+  GNUNET_SET_iterate(iter_set,
+                     &iter_cb,
+                     iter_set);
 }
 
 
@@ -286,38 +292,38 @@ test_iter ()
  * @param cls closure
  */
 static void
-do_shutdown (void *cls)
+do_shutdown(void *cls)
 {
   if (NULL != tt)
-  {
-    GNUNET_SCHEDULER_cancel (tt);
-    tt = NULL;
-  }
+    {
+      GNUNET_SCHEDULER_cancel(tt);
+      tt = NULL;
+    }
   if (NULL != oh1)
-  {
-    GNUNET_SET_operation_cancel (oh1);
-    oh1 = NULL;
-  }
+    {
+      GNUNET_SET_operation_cancel(oh1);
+      oh1 = NULL;
+    }
   if (NULL != oh2)
-  {
-    GNUNET_SET_operation_cancel (oh2);
-    oh2 = NULL;
-  }
+    {
+      GNUNET_SET_operation_cancel(oh2);
+      oh2 = NULL;
+    }
   if (NULL != set1)
-  {
-    GNUNET_SET_destroy (set1);
-    set1 = NULL;
-  }
+    {
+      GNUNET_SET_destroy(set1);
+      set1 = NULL;
+    }
   if (NULL != set2)
-  {
-    GNUNET_SET_destroy (set2);
-    set2 = NULL;
-  }
+    {
+      GNUNET_SET_destroy(set2);
+      set2 = NULL;
+    }
   if (NULL != listen_handle)
-  {
-    GNUNET_SET_listen_cancel (listen_handle);
-    listen_handle = NULL;
-  }
+    {
+      GNUNET_SET_listen_cancel(listen_handle);
+      listen_handle = NULL;
+    }
 }
 
 
@@ -327,12 +333,12 @@ do_shutdown (void *cls)
  * @param cls closure
  */
 static void
-timeout_fail (void *cls)
+timeout_fail(void *cls)
 {
   tt = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
-              "Testcase failed with timeout\n");
-  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
+             "Testcase failed with timeout\n");
+  GNUNET_SCHEDULER_shutdown();
   ret = 1;
 }
 
@@ -346,41 +352,41 @@ timeout_fail (void *cls)
  * @param peer identity of the peer that was created
  */
 static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
+run(void *cls,
+    const struct GNUNET_CONFIGURATION_Handle *cfg,
+    struct GNUNET_TESTING_Peer *peer)
 {
   config = cfg;
-  GNUNET_TESTING_peer_get_identity (peer,
-                                    &local_id);
+  GNUNET_TESTING_peer_get_identity(peer,
+                                   &local_id);
   if (0)
-    test_iter ();
+    test_iter();
 
-  tt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5),
-                                     &timeout_fail,
-                                     NULL);
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
-                                 NULL);
+  tt = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5),
+                                    &timeout_fail,
+                                    NULL);
+  GNUNET_SCHEDULER_add_shutdown(&do_shutdown,
+                                NULL);
 
-  set1 = GNUNET_SET_create (cfg,
-                            GNUNET_SET_OPERATION_INTERSECTION);
-  set2 = GNUNET_SET_create (cfg,
-                            GNUNET_SET_OPERATION_INTERSECTION);
-  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
-                                    &app_id);
+  set1 = GNUNET_SET_create(cfg,
+                           GNUNET_SET_OPERATION_INTERSECTION);
+  set2 = GNUNET_SET_create(cfg,
+                           GNUNET_SET_OPERATION_INTERSECTION);
+  GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK,
+                                   &app_id);
 
   /* test the real set reconciliation */
-  init_set1 ();
+  init_set1();
 }
 
 
 int
-main (int argc,
-      char **argv)
+main(int argc,
+     char **argv)
 {
-  if (0 != GNUNET_TESTING_peer_run ("test_set_intersection_result_full",
-                                    "test_set.conf",
-                                    &run, NULL))
+  if (0 != GNUNET_TESTING_peer_run("test_set_intersection_result_full",
+                                   "test_set.conf",
+                                   &run, NULL))
     return 1;
   return ret;
 }