From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 5 May 2011 13:36:18 +0000 (+0000)
Subject: check
X-Git-Tag: initial-import-from-subversion-38251~18543
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a62cd21e71caa9c19078fa89364dc819536f6ffd;p=oweals%2Fgnunet.git

check
---

diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 35592225a..6bc287da3 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -267,14 +267,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);    
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c
index afb544f51..c99dd04de 100644
--- a/src/fs/test_fs_download_indexed.c
+++ b/src/fs/test_fs_download_indexed.c
@@ -267,14 +267,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index 035cbb55e..b058367a2 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -331,14 +331,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index d53732eaf..b46ebf52d 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -209,14 +209,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 02bb62807..b4d487ddc 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -81,14 +81,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c
index dda7bb4f2..291ab6d9d 100644
--- a/src/fs/test_fs_namespace_list_updateable.c
+++ b/src/fs/test_fs_namespace_list_updateable.c
@@ -86,14 +86,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   if (uri_this != NULL)
     GNUNET_FS_uri_destroy (uri_this);
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index b206fb415..dcce43cdf 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -195,14 +195,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index 1610c25c1..fdb5beb7d 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -252,14 +252,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index 0c44cb612..a1f3208ef 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -200,14 +200,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index f04dad9f3..47d177a81 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -269,14 +269,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c
index efc744080..5080ecc18 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -72,14 +72,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index 99611a6c8..6774d0dfa 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -205,14 +205,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c
index ee4a4c2db..095c6961f 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -273,14 +273,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
+  if (NULL != p->arm_proc)
+    {
+      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+      GNUNET_OS_process_close (p->arm_proc);
+      p->arm_proc = NULL;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }