From 89b04f2191392dc6b72121e5cc649cb0a64fa3cf Mon Sep 17 00:00:00 2001 From: Aurelien DARRAGON Date: Wed, 4 Jun 2025 16:51:04 +0200 Subject: [PATCH] CLEANUP: sink: remove useless cleanup in sink_new_from_logger() As reported by Ilya in GH #2994, some cleanup parts in sink_new_from_logger() function are not used. We can actually simplify the cleanup logic to remove dead code, let's do that by renaming "error_final" label to "error" and only making use of the "error" label, because sink_free() already takes care of proper cleanup for all sink members. --- src/sink.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/sink.c b/src/sink.c index b05e55dad..0ed32c252 100644 --- a/src/sink.c +++ b/src/sink.c @@ -1268,15 +1268,11 @@ struct sink *sink_new_from_logger(struct logger *logger) HA_SPIN_INIT(&srv->lock); if (sink_finalize(sink) & ERR_CODE) - goto error_final; + goto error; return sink; - error: - if (srv) - srv_detach(srv); - srv_drop(srv); - error_final: + error: sink_free(sink); return NULL;