From 88295b5a3adc0f17ffd5fa4d2c1fafc632db6dab Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 29 Jul 2016 22:59:57 +0000 Subject: -dce/fix ftbfs --- .../test_gnunet_daemon_hostlist_learning.c | 30 +++++++++------------- 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'src/hostlist') diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 6edc6cbbd..54f219ad8 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c @@ -43,7 +43,6 @@ struct PeerContext { struct GNUNET_CONFIGURATION_Handle *cfg; - struct GNUNET_TRANSPORT_Handle *th; struct GNUNET_MessageHeader *hello; struct GNUNET_CORE_Handle *core; struct GNUNET_STATISTICS_Handle *stats; @@ -123,22 +122,12 @@ shutdown_testcase () GNUNET_free (current_adv_uri); current_adv_uri = NULL; } - if (adv_peer.th != NULL) - { - GNUNET_TRANSPORT_disconnect (adv_peer.th); - adv_peer.th = NULL; - } - if (learn_peer.th != NULL) - { - GNUNET_TRANSPORT_disconnect (learn_peer.th); - learn_peer.th = NULL; - } - if (adv_peer.core != NULL) + if (NULL != adv_peer.core) { GNUNET_CORE_disconnect (adv_peer.core); adv_peer.core = NULL; } - if (learn_peer.core != NULL) + if (NULL != learn_peer.core) { GNUNET_CORE_disconnect (learn_peer.core); learn_peer.core = NULL; @@ -153,13 +142,18 @@ shutdown_testcase () adv_peer.arm_proc = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing hostlist client ARM process.\n"); - if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, GNUNET_TERM_SIG)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); + if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, + GNUNET_TERM_SIG)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "kill"); + if (GNUNET_OK != + GNUNET_OS_process_wait (learn_peer.arm_proc)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "waitpid"); GNUNET_OS_process_destroy (learn_peer.arm_proc); learn_peer.arm_proc = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Shutdown complete....\n"); } /** -- cgit v1.2.3