From ec3b01719d0dc6d12bfa3cc093fb30453e42e146 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 15 Jul 2011 11:41:27 +0000
Subject: [PATCH] fix

---
 src/transport/plugin_transport_udp.c  |  1 +
 src/transport/test_quota_compliance.c | 25 ++++++++++++++-----------
 src/transport/test_transport_api.c    | 25 +++++++++++++++++--------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index bc45e496f..07cffa60c 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -938,6 +938,7 @@ udp_read (struct Plugin *plugin,
 	{
 	  /* remove 'rc' that was inactive the longest */
 	  rc = GNUNET_CONTAINER_heap_remove_root (plugin->defrags);
+	  GNUNET_assert (NULL != rc);
 	  GNUNET_DEFRAGMENT_context_destroy (rc->defrag);
 	  GNUNET_free (rc);
 	}      
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 086561095..466ec9674 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -559,11 +559,11 @@ exchange_hello_last (void *cls,
 {
   struct PeerContext *me = cls;
 
+  GNUNET_assert (message != NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Exchanging HELLO of size %d with peer (%s)!\n", 
 	      (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message),
 	      GNUNET_i2s (&me->id));
-  GNUNET_assert (message != NULL);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
                                       message, &me->id));
@@ -648,8 +648,10 @@ setup_peer (struct PeerContext *p, const char *cfgname)
   p->cfg = GNUNET_CONFIGURATION_create ();
   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_DISK_directory_remove (p->servicehome);
+    }
 
 #if START_ARM
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL,
@@ -922,16 +924,17 @@ main (int argc, char *argv[])
   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);
+    }
   GNUNET_free(logger);
-
   return ret;
 }
 
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index ae56c939f..c86fe4258 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -143,11 +143,11 @@ exchange_hello_last (void *cls,
 {
   struct PeerContext *me = cls;
 
+  GNUNET_assert (message != NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Exchanging HELLO of size %d with peer (%s)!\n", 
 	      (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message),
 	      GNUNET_i2s (&me->id));
-  GNUNET_assert (message != NULL);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
                                       message, &me->id));
@@ -296,8 +296,14 @@ setup_peer (struct PeerContext *p,
 
   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",
@@ -542,13 +548,16 @@ check ()
       GNUNET_free(cert_file_p2);
     }
 
-  if ((p1.servicehome != NULL) && (p2.servicehome != NULL))
-  {
+  if (p1.servicehome != NULL)
+    {
     GNUNET_DISK_directory_remove (p1.servicehome);
-    GNUNET_DISK_directory_remove (p2.servicehome);
     GNUNET_free(p1.servicehome);
-    GNUNET_free(p2.servicehome);
-  }
+    }
+  if.servicehome != NULL)
+    {
+      GNUNET_DISK_directory_remove (p2.servicehome);
+      GNUNET_free(p2.servicehome);
+    }
   return ok;
 }
 
-- 
2.25.1