From: Jérémie Galarneau Date: Tue, 27 Aug 2019 20:46:36 +0000 (-0400) Subject: Use case-scope error labels handling LTTNG_CONSUMER_DESTROY_CHANNEL X-Git-Tag: v2.11.0-rc3~58 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=09d3dbc082259eed7efd0d0fdfa28e9d68410a36;p=lttng-tools.git Use case-scope error labels handling LTTNG_CONSUMER_DESTROY_CHANNEL This cleans-up the error handling of the case handling the LTTNG_CONSUMER_DESTROY_CHANNEL command. This is done in order to allow a follow-up commit to perform some common clean-up operations on error while introducing as few changes as possible. No behaviour change is intended. Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c index 95c92ba9b..196da6633 100644 --- a/src/common/kernel-consumer/kernel-consumer.c +++ b/src/common/kernel-consumer/kernel-consumer.c @@ -979,14 +979,14 @@ error_streams_sent_nosignal: ret = consumer_send_status_msg(sock, ret_code); if (ret < 0) { /* Somehow, the session daemon is not responding anymore. */ - goto end_nosignal; + goto end_destroy_channel; } health_code_update(); /* Stop right now if no channel was found. */ if (!channel) { - goto end_nosignal; + goto end_destroy_channel; } /* @@ -1002,7 +1002,7 @@ error_streams_sent_nosignal: assert(!uatomic_sub_return(&channel->refcount, 1)); consumer_del_channel(channel); - +end_destroy_channel: goto end_nosignal; } case LTTNG_CONSUMER_DISCARDED_EVENTS: