aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fs/test_fs_download.c19
-rw-r--r--src/fs/test_fs_download_indexed.c19
-rw-r--r--src/fs/test_fs_download_persistence.c19
-rw-r--r--src/fs/test_fs_list_indexed.c19
-rw-r--r--src/fs/test_fs_namespace.c19
-rw-r--r--src/fs/test_fs_namespace_list_updateable.c19
-rw-r--r--src/fs/test_fs_publish.c19
-rw-r--r--src/fs/test_fs_publish_persistence.c19
-rw-r--r--src/fs/test_fs_search.c19
-rw-r--r--src/fs/test_fs_search_persistence.c19
-rw-r--r--src/fs/test_fs_start_stop.c19
-rw-r--r--src/fs/test_fs_unindex.c19
-rw-r--r--src/fs/test_fs_unindex_persistence.c19
13 files changed, 143 insertions, 104 deletions
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
267stop_arm (struct PeerContext *p) 267stop_arm (struct PeerContext *p)
268{ 268{
269#if START_ARM 269#if START_ARM
270 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 270 if (NULL != p->arm_proc)
271 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 271 {
272 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 272 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
273 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 273 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
274 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 274 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
275 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 275 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
276 GNUNET_OS_process_close (p->arm_proc); 276 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
277 p->arm_proc = NULL; 277 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
278 GNUNET_OS_process_close (p->arm_proc);
279 p->arm_proc = NULL;
280 }
278#endif 281#endif
279 GNUNET_CONFIGURATION_destroy (p->cfg); 282 GNUNET_CONFIGURATION_destroy (p->cfg);
280} 283}
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
267stop_arm (struct PeerContext *p) 267stop_arm (struct PeerContext *p)
268{ 268{
269#if START_ARM 269#if START_ARM
270 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 270 if (NULL != p->arm_proc)
271 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 271 {
272 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 272 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
273 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 273 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
274 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 274 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
275 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 275 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
276 GNUNET_OS_process_close (p->arm_proc); 276 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
277 p->arm_proc = NULL; 277 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
278 GNUNET_OS_process_close (p->arm_proc);
279 p->arm_proc = NULL;
280 }
278#endif 281#endif
279 GNUNET_CONFIGURATION_destroy (p->cfg); 282 GNUNET_CONFIGURATION_destroy (p->cfg);
280} 283}
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
331stop_arm (struct PeerContext *p) 331stop_arm (struct PeerContext *p)
332{ 332{
333#if START_ARM 333#if START_ARM
334 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 334 if (NULL != p->arm_proc)
335 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 335 {
336 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 336 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
337 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 337 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
338 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 338 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
339 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 339 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
340 GNUNET_OS_process_close (p->arm_proc); 340 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
341 p->arm_proc = NULL; 341 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
342 GNUNET_OS_process_close (p->arm_proc);
343 p->arm_proc = NULL;
344 }
342#endif 345#endif
343 GNUNET_CONFIGURATION_destroy (p->cfg); 346 GNUNET_CONFIGURATION_destroy (p->cfg);
344} 347}
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
209stop_arm (struct PeerContext *p) 209stop_arm (struct PeerContext *p)
210{ 210{
211#if START_ARM 211#if START_ARM
212 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 212 if (NULL != p->arm_proc)
213 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 213 {
214 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 214 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
215 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 215 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
216 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 216 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
217 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 217 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
218 GNUNET_OS_process_close (p->arm_proc); 218 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
219 p->arm_proc = NULL; 219 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
220 GNUNET_OS_process_close (p->arm_proc);
221 p->arm_proc = NULL;
222 }
220#endif 223#endif
221 GNUNET_CONFIGURATION_destroy (p->cfg); 224 GNUNET_CONFIGURATION_destroy (p->cfg);
222} 225}
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
81stop_arm (struct PeerContext *p) 81stop_arm (struct PeerContext *p)
82{ 82{
83#if START_ARM 83#if START_ARM
84 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 84 if (NULL != p->arm_proc)
85 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 85 {
86 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 86 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
87 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 87 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
88 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 88 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
89 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 89 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
90 GNUNET_OS_process_close (p->arm_proc); 90 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
91 p->arm_proc = NULL; 91 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
92 GNUNET_OS_process_close (p->arm_proc);
93 p->arm_proc = NULL;
94 }
92#endif 95#endif
93 GNUNET_CONFIGURATION_destroy (p->cfg); 96 GNUNET_CONFIGURATION_destroy (p->cfg);
94} 97}
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
86stop_arm (struct PeerContext *p) 86stop_arm (struct PeerContext *p)
87{ 87{
88#if START_ARM 88#if START_ARM
89 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 89 if (NULL != p->arm_proc)
90 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 90 {
91 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 91 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
92 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 92 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
93 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 93 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
94 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 94 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
95 GNUNET_OS_process_close (p->arm_proc); 95 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
96 p->arm_proc = NULL; 96 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
97 GNUNET_OS_process_close (p->arm_proc);
98 p->arm_proc = NULL;
99 }
97#endif 100#endif
98 if (uri_this != NULL) 101 if (uri_this != NULL)
99 GNUNET_FS_uri_destroy (uri_this); 102 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
195stop_arm (struct PeerContext *p) 195stop_arm (struct PeerContext *p)
196{ 196{
197#if START_ARM 197#if START_ARM
198 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 198 if (NULL != p->arm_proc)
199 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 199 {
200 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 200 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
201 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 201 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
202 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 202 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
203 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 203 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
204 GNUNET_OS_process_close (p->arm_proc); 204 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
205 p->arm_proc = NULL; 205 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
206 GNUNET_OS_process_close (p->arm_proc);
207 p->arm_proc = NULL;
208 }
206#endif 209#endif
207 GNUNET_CONFIGURATION_destroy (p->cfg); 210 GNUNET_CONFIGURATION_destroy (p->cfg);
208} 211}
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
252stop_arm (struct PeerContext *p) 252stop_arm (struct PeerContext *p)
253{ 253{
254#if START_ARM 254#if START_ARM
255 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 255 if (NULL != p->arm_proc)
256 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 256 {
257 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 257 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
258 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 258 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
259 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 259 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
260 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 260 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
261 GNUNET_OS_process_close (p->arm_proc); 261 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
262 p->arm_proc = NULL; 262 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
263 GNUNET_OS_process_close (p->arm_proc);
264 p->arm_proc = NULL;
265 }
263#endif 266#endif
264 GNUNET_CONFIGURATION_destroy (p->cfg); 267 GNUNET_CONFIGURATION_destroy (p->cfg);
265} 268}
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
200stop_arm (struct PeerContext *p) 200stop_arm (struct PeerContext *p)
201{ 201{
202#if START_ARM 202#if START_ARM
203 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 203 if (NULL != p->arm_proc)
204 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 204 {
205 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 205 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
206 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 206 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
207 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 207 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
208 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 208 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
209 GNUNET_OS_process_close (p->arm_proc); 209 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
210 p->arm_proc = NULL; 210 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
211 GNUNET_OS_process_close (p->arm_proc);
212 p->arm_proc = NULL;
213 }
211#endif 214#endif
212 GNUNET_CONFIGURATION_destroy (p->cfg); 215 GNUNET_CONFIGURATION_destroy (p->cfg);
213} 216}
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
269stop_arm (struct PeerContext *p) 269stop_arm (struct PeerContext *p)
270{ 270{
271#if START_ARM 271#if START_ARM
272 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 272 if (NULL != p->arm_proc)
273 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 273 {
274 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 274 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
275 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 275 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
276 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 276 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
277 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 277 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
278 GNUNET_OS_process_close (p->arm_proc); 278 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
279 p->arm_proc = NULL; 279 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
280 GNUNET_OS_process_close (p->arm_proc);
281 p->arm_proc = NULL;
282 }
280#endif 283#endif
281 GNUNET_CONFIGURATION_destroy (p->cfg); 284 GNUNET_CONFIGURATION_destroy (p->cfg);
282} 285}
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
72stop_arm (struct PeerContext *p) 72stop_arm (struct PeerContext *p)
73{ 73{
74#if START_ARM 74#if START_ARM
75 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 75 if (NULL != p->arm_proc)
76 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 76 {
77 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 77 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
78 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 78 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
79 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 79 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
80 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 80 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
81 GNUNET_OS_process_close (p->arm_proc); 81 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
82 p->arm_proc = NULL; 82 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
83 GNUNET_OS_process_close (p->arm_proc);
84 p->arm_proc = NULL;
85 }
83#endif 86#endif
84 GNUNET_CONFIGURATION_destroy (p->cfg); 87 GNUNET_CONFIGURATION_destroy (p->cfg);
85} 88}
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
205stop_arm (struct PeerContext *p) 205stop_arm (struct PeerContext *p)
206{ 206{
207#if START_ARM 207#if START_ARM
208 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 208 if (NULL != p->arm_proc)
209 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 209 {
210 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 210 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
211 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 211 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
212 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 212 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
213 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 213 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
214 GNUNET_OS_process_close (p->arm_proc); 214 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
215 p->arm_proc = NULL; 215 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
216 GNUNET_OS_process_close (p->arm_proc);
217 p->arm_proc = NULL;
218 }
216#endif 219#endif
217 GNUNET_CONFIGURATION_destroy (p->cfg); 220 GNUNET_CONFIGURATION_destroy (p->cfg);
218} 221}
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
273stop_arm (struct PeerContext *p) 273stop_arm (struct PeerContext *p)
274{ 274{
275#if START_ARM 275#if START_ARM
276 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) 276 if (NULL != p->arm_proc)
277 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 277 {
278 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) 278 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
279 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 279 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
280 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 280 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
281 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); 281 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
282 GNUNET_OS_process_close (p->arm_proc); 282 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
283 p->arm_proc = NULL; 283 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
284 GNUNET_OS_process_close (p->arm_proc);
285 p->arm_proc = NULL;
286 }
284#endif 287#endif
285 GNUNET_CONFIGURATION_destroy (p->cfg); 288 GNUNET_CONFIGURATION_destroy (p->cfg);
286} 289}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 06:22:43 +0000