From 0255fb4a2357392f1676e3a48d5dd81168f2f9d1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 12 Nov 2023 16:17:55 +0100 Subject: handle helper errors better --- src/util/conversion.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/util') diff --git a/src/util/conversion.c b/src/util/conversion.c index 504bb5ac0..a7bc63789 100644 --- a/src/util/conversion.c +++ b/src/util/conversion.c @@ -255,11 +255,6 @@ child_done_cb (void *cls, json_error_t err; ec->cwh = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Conversion helper exited with status %d and code %llu after outputting %llu bytes of data\n", - (int) type, - (unsigned long long) exit_code, - (unsigned long long) ec->read_pos); if (NULL != ec->read_task) { GNUNET_SCHEDULER_cancel (ec->read_task); @@ -267,11 +262,11 @@ child_done_cb (void *cls, the read buffer. So drain it now, just in case. */ read_cb (ec); } - if (NULL != ec->read_task) - { - GNUNET_SCHEDULER_cancel (ec->read_task); - ec->read_task = NULL; - } + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Conversion helper exited with status %d and code %llu after outputting %llu bytes of data\n", + (int) type, + (unsigned long long) exit_code, + (unsigned long long) ec->read_pos); GNUNET_OS_process_destroy (ec->helper); ec->helper = NULL; if (0 != ec->read_pos) -- cgit v1.2.3