[GNUnet-SVN] r22915 - in gnunet/src: gns util

[gnunet]

Author: grothoff
Date: 2012-07-25 17:15:19 +0200 (Wed, 25 Jul 2012)
New Revision: 22915

Modified:
   gnunet/src/gns/test_gns_proxy.c
   gnunet/src/util/test_configuration.c
Log:
-fixes

Modified: gnunet/src/gns/test_gns_proxy.c
===================================================================
--- gnunet/src/gns/test_gns_proxy.c     2012-07-25 15:07:51 UTC (rev 22914)
+++ gnunet/src/gns/test_gns_proxy.c     2012-07-25 15:15:19 UTC (rev 22915)
@@ -135,10 +135,19 @@
   GNUNET_free_non_null (url);
 
   if (NULL != tmp_cfgfile)
-    remove (tmp_cfgfile);
-
+    {
+      if (0 != remove (tmp_cfgfile))
+       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", 
tmp_cfgfile);
+      GNUNET_free (tmp_cfgfile);
+      tmp_cfgfile = NULL;
+    }
   if (NULL != proxy_proc)
-    GNUNET_OS_process_kill (proxy_proc, 9);
+    {
+      (void) GNUNET_OS_process_kill (proxy_proc, SIGKILL);
+      GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proxy_proc));
+      GNUNET_OS_process_destroy (proxy_proc);
+      proxy_proc = NULL;
+    }
   url = NULL;
 }
 

Modified: gnunet/src/util/test_configuration.c
===================================================================
--- gnunet/src/util/test_configuration.c        2012-07-25 15:07:51 UTC (rev 
22914)
+++ gnunet/src/util/test_configuration.c        2012-07-25 15:15:19 UTC (rev 
22915)
@@ -231,7 +231,8 @@
   /* Compare the dumped configuration with modifications done */
   cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, diffsFileName));
-  remove (diffsFileName);
+  if (0 != remove (diffsFileName))
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", 
diffsFileName);
   cbData.callBackOption = COMPARE;
   cbData.cfgDiffs = cfgDiffs;
   GNUNET_CONFIGURATION_iterate (cfg, diffsCallBack, &cbData);