update clang-format

[oweals/gnunet.git] / src / namestore / test_namestore_api_zone_iteration_nick.c

diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c
index 088422ca37087d990c07460020d66aef6fc5a389..9df6c98cca899389cf7893982926fd19f05b82b6 100644 (file)
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -37,8 +37,6 @@
 
 static struct GNUNET_NAMESTORE_Handle * nsh;
 
-static struct GNUNET_SCHEDULER_Task * endbadly_task;
-
 static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
 
 static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
@@ -71,7 +69,7 @@ static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
  * @param tc scheduler context
  */
 static void
-endbadly (void *cls)
+end (void *cls)
 {
   if (NULL != zi)
   {
@@ -83,9 +81,9 @@ endbadly (void *cls)
     GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
-  GNUNET_free_non_null(s_name_1);
-  GNUNET_free_non_null(s_name_2);
-  GNUNET_free_non_null(s_name_3);
+  GNUNET_free_non_null (s_name_1);
+  GNUNET_free_non_null (s_name_2);
+  GNUNET_free_non_null (s_name_3);
 
   if (s_rd_1 != NULL)
   {
@@ -104,99 +102,50 @@ endbadly (void *cls)
   }
 
   if (privkey != NULL)
-    GNUNET_free (privkey);
-  privkey = NULL;
-
-  if (privkey2 != NULL)
-    GNUNET_free (privkey2);
-  privkey2 = NULL;
-  res = 1;
-}
-
-
-static void
-end (void *cls)
-{
-  if (NULL != zi)
   {
-    GNUNET_NAMESTORE_zone_iteration_stop (zi);
-    zi = NULL;
-  }
-  if (endbadly_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = NULL;
-  }
-
-  if (privkey != NULL)
     GNUNET_free (privkey);
-  privkey = NULL;
-
-  if (privkey2 != NULL)
-    GNUNET_free (privkey2);
-  privkey2 = NULL;
-
-  GNUNET_free (s_name_1);
-  GNUNET_free (s_name_2);
-  GNUNET_free (s_name_3);
-  if (s_rd_1 != NULL)
-  {
-    GNUNET_free ((void *)s_rd_1->data);
-    GNUNET_free (s_rd_1);
+    privkey = NULL;
   }
-  if (s_rd_2 != NULL)
-  {
-    GNUNET_free ((void *)s_rd_2->data);
-    GNUNET_free (s_rd_2);
-  }
-  if (s_rd_3 != NULL)
+  if (privkey2 != NULL)
   {
-    GNUNET_free ((void *)s_rd_3->data);
-    GNUNET_free (s_rd_3);
+    GNUNET_free (privkey2);
+    privkey2 = NULL;
   }
-  if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh);
-  nsh = NULL;
 }
 
 
 static int
 check_zone_1 (const char *label, unsigned int rd_count,
-    const struct GNUNET_GNSRECORD_Data *rd)
+             const struct GNUNET_GNSRECORD_Data *rd)
 {
-  int failed = GNUNET_NO;
-  int c;
-  for (c = 0; c< rd_count ; c++)
+  for (unsigned int c = 0; c< rd_count ; c++)
   {
-    if (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK)
-        if (0 != strcmp (rd[c].data, ZONE_NICK_1))
-        {
-          GNUNET_break (0);
-          return GNUNET_YES;
-        }
+    if ( (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
+        (0 != strcmp (rd[c].data, ZONE_NICK_1)) )
+    {
+      GNUNET_break (0);
+      return GNUNET_YES;
+    }
   }
-  return failed;
+  return GNUNET_NO;
 }
 
+
 static int
 check_zone_2 (const char *label,
-           unsigned int rd_count,
-           const struct GNUNET_GNSRECORD_Data *rd)
+             unsigned int rd_count,
+             const struct GNUNET_GNSRECORD_Data *rd)
 {
-  int failed = GNUNET_NO;
-  int c;
-
-  for (c = 0; c< rd_count ; c++)
+  for (unsigned int c = 0; c< rd_count ; c++)
   {
-    if (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK)
-        if (0 != strcmp (rd[c].data, ZONE_NICK_2))
-        {
-          GNUNET_break (0);
-          return GNUNET_YES;
-        }
+    if ( (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
+        (0 != strcmp (rd[c].data, ZONE_NICK_2)) )
+    {
+      GNUNET_break (0);
+      return GNUNET_YES;
+    }
   }
-
-  return failed;
+  return GNUNET_NO;
 }
 
 
@@ -208,7 +157,7 @@ zone_proc_end (void *cls)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received last result, iteration done after receing %u results\n",
               returned_records);
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -254,7 +203,7 @@ zone_proc (void *cls,
   {
     GNUNET_break (0);
     res = 1;
-    GNUNET_SCHEDULER_add_now (&end, NULL);
+    GNUNET_SCHEDULER_shutdown ();
   }
 }
 
@@ -283,9 +232,7 @@ put_cont (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n",
                emsg);
     GNUNET_break (0);
-    if (NULL != endbadly_task)
-       GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
@@ -306,9 +253,7 @@ put_cont (void *cls,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n");
       GNUNET_break (0);
-      if (NULL != endbadly_task)
-       GNUNET_SCHEDULER_cancel (endbadly_task);
-      endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
   }
@@ -406,9 +351,7 @@ empty_zone_proc (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                _("Expected empty zone but received zone private key\n"));
     GNUNET_break (0);
-    if (endbadly_task != NULL)
-      GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   if ((NULL != label) || (NULL != rd) || (0 != rd_count))
@@ -416,9 +359,7 @@ empty_zone_proc (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                _("Expected no zone content but received data\n"));
     GNUNET_break (0);
-    if (endbadly_task != NULL)
-      GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   GNUNET_assert (0);
@@ -454,12 +395,10 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
-  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                                &endbadly,
-                                                NULL);
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
-
+  GNUNET_SCHEDULER_add_shutdown (&end,
+                                NULL);
   /* first, iterate over empty namestore */
   zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
                                             NULL,
@@ -474,8 +413,7 @@ run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to create zone iterator\n");
     GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    GNUNET_SCHEDULER_shutdown ();
   }
 }