-indent, doxygen

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

diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index fdaef8d902ecd5cb487d64cfe51fe569c8fac28f..0a85b5182754140670fac5d7c4de2ed8b08d3a5a 100644 (file)
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -56,6 +56,7 @@ static char * s_name_3;
 
 static struct GNUNET_GNSRECORD_Data *s_rd_3;
 
+static char *directory;
 
 /**
  * Re-establish the connection to the service.
@@ -310,6 +311,7 @@ create_record (unsigned int count)
     rd[c].record_type = 1111;
     rd[c].data_size = 50;
     rd[c].data = GNUNET_malloc(50);
+    rd[c].flags = 0;
     memset ((char *) rd[c].data, 'a', 50);
   }
   return rd;
@@ -331,26 +333,26 @@ empty_zone_proc (void *cls,
   char *hostkey_file;
 
   GNUNET_assert (nsh == cls);
-       if (NULL != zone)
-       {
-         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                       _("Expected empty zone but received zone private key\n"));
-    GNUNET_break (0);
-    if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+  if (NULL != zone)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _("Expected empty zone but received zone private key\n"));
+      GNUNET_break (0);
+      if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
        GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-       }
-       if ((NULL != label) || (NULL != rd) || (0 != rd_count))
-       {
-         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                       _("Expected no zone content but received data\n"));
-    GNUNET_break (0);
-    if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+      endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      return;
+    }
+  if ((NULL != label) || (NULL != rd) || (0 != rd_count))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _("Expected no zone content but received data\n"));
+      GNUNET_break (0);
+      if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
        GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-       }
+      endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      return;
+    }
 
 
   zi = NULL;
@@ -396,6 +398,10 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
+  directory = NULL;
+  GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+  GNUNET_DISK_directory_remove (directory);
+
   endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
@@ -416,14 +422,20 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
   res = 1;
   if (0 !=
       GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration",
                                "test_namestore_api.conf",
                                &run,
                                NULL))
-    return 1;
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   return res;
 }