[GNUnet-SVN] r16009 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2011-07-15 13:47:38 +0200 (Fri, 15 Jul 2011)
New Revision: 16009

Modified:
   gnunet/src/transport/test_transport_api_multiaddress.c
Log:
fix

Modified: gnunet/src/transport/test_transport_api_multiaddress.c
===================================================================
--- gnunet/src/transport/test_transport_api_multiaddress.c      2011-07-15 
11:46:26 UTC (rev 16008)
+++ gnunet/src/transport/test_transport_api_multiaddress.c      2011-07-15 
11:47:38 UTC (rev 16009)
@@ -216,8 +216,13 @@
 
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
-      GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", 
&p->servicehome);
-  GNUNET_DISK_directory_remove (p->servicehome);
+    {
+      GNUNET_assert (GNUNET_OK == 
+                    GNUNET_CONFIGURATION_get_value_string (p->cfg, 
+                                                           "PATHS", 
"SERVICEHOME", 
+                                                           &p->servicehome));
+      GNUNET_DISK_directory_remove (p->servicehome);
+    }
 
 #if START_ARM
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
@@ -274,11 +279,6 @@
 #endif
                                         "-c", cfgname, NULL);
 #endif
-
-
-  if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
-      GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", 
&p->servicehome);
-
   p->th = GNUNET_TRANSPORT_connect (p->cfg,
                                     NULL, p,
                                     NULL,
@@ -351,13 +351,16 @@
   stop_arm (&p1);
   stop_arm (&p2);
 
-  if ((p1.servicehome != NULL) && (p2.servicehome != NULL))
-  {
-    GNUNET_DISK_directory_remove (p1.servicehome);
-    GNUNET_DISK_directory_remove (p2.servicehome);
-    GNUNET_free(p1.servicehome);
-    GNUNET_free(p2.servicehome);
-  }
+  if (p1.servicehome != NULL)
+    {
+      GNUNET_DISK_directory_remove (p1.servicehome);
+      GNUNET_free(p1.servicehome);
+    }
+  if (p2.servicehome != NULL)
+    {
+      GNUNET_DISK_directory_remove (p2.servicehome);
+      GNUNET_free(p2.servicehome);
+    }
   return ok;
 }