diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-05-05 13:36:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-05-05 13:36:18 +0000 |
commit | a62cd21e71caa9c19078fa89364dc819536f6ffd (patch) | |
tree | cb88ac33fa986ca8f0bef59f00f5d991227f875e /src/fs/test_fs_download_persistence.c | |
parent | db90fb75efb404b6006a0e7cbf27f00fa931d860 (diff) | |
download | gnunet-a62cd21e71caa9c19078fa89364dc819536f6ffd.tar.gz gnunet-a62cd21e71caa9c19078fa89364dc819536f6ffd.zip |
check
Diffstat (limited to 'src/fs/test_fs_download_persistence.c')
-rw-r--r-- | src/fs/test_fs_download_persistence.c | 19 |
1 files changed, 11 insertions, 8 deletions
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 | |||
331 | stop_arm (struct PeerContext *p) | 331 | stop_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 | } |