diff options
Diffstat (limited to 'src/arm/arm_api.c')
-rw-r--r-- | src/arm/arm_api.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index da7268f67..4c6ce3240 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -288,8 +288,7 @@ handle_arm_result (void *cls, | |||
288 | wait for the result message, but also wait for the service to close | 288 | wait for the result message, but also wait for the service to close |
289 | the connection (and then we have to close our client handle as well); | 289 | the connection (and then we have to close our client handle as well); |
290 | this is done by installing a different receive handler, waiting for | 290 | this is done by installing a different receive handler, waiting for |
291 | the connection to go down */ | 291 | the connection to go down */if (NULL != h->thm) |
292 | if (NULL != h->thm) | ||
293 | { | 292 | { |
294 | GNUNET_break (0); | 293 | GNUNET_break (0); |
295 | op->result_cont (h->thm->cont_cls, | 294 | op->result_cont (h->thm->cont_cls, |
@@ -956,8 +955,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h, | |||
956 | * 2) We're not connected to ARM. | 955 | * 2) We're not connected to ARM. |
957 | * Cancel any reconnection attempts temporarily, then perform | 956 | * Cancel any reconnection attempts temporarily, then perform |
958 | * a service test. | 957 | * a service test. |
959 | */ | 958 | */if (GNUNET_YES == h->currently_up) |
960 | if (GNUNET_YES == h->currently_up) | ||
961 | { | 959 | { |
962 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 960 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
963 | "ARM is already running\n"); | 961 | "ARM is already running\n"); |
@@ -976,8 +974,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h, | |||
976 | yet complete the MQ handshake. However, given that users | 974 | yet complete the MQ handshake. However, given that users |
977 | are unlikely to hammer 'gnunet-arm -s' on a busy system, | 975 | are unlikely to hammer 'gnunet-arm -s' on a busy system, |
978 | the above check should catch 99.99% of the cases where ARM | 976 | the above check should catch 99.99% of the cases where ARM |
979 | is already running. */ | 977 | is already running. */LOG (GNUNET_ERROR_TYPE_DEBUG, |
980 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
981 | "Starting ARM service\n"); | 978 | "Starting ARM service\n"); |
982 | if (NULL == (sig = GNUNET_DISK_pipe (GNUNET_NO, | 979 | if (NULL == (sig = GNUNET_DISK_pipe (GNUNET_NO, |
983 | GNUNET_NO, | 980 | GNUNET_NO, |