mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-07 15:47:01 +02:00
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.
This commit is contained in:
parent
8c4bb8cab3
commit
89b04f2191
@ -1268,15 +1268,11 @@ struct sink *sink_new_from_logger(struct logger *logger)
|
|||||||
HA_SPIN_INIT(&srv->lock);
|
HA_SPIN_INIT(&srv->lock);
|
||||||
|
|
||||||
if (sink_finalize(sink) & ERR_CODE)
|
if (sink_finalize(sink) & ERR_CODE)
|
||||||
goto error_final;
|
goto error;
|
||||||
|
|
||||||
return sink;
|
return sink;
|
||||||
error:
|
|
||||||
if (srv)
|
|
||||||
srv_detach(srv);
|
|
||||||
srv_drop(srv);
|
|
||||||
|
|
||||||
error_final:
|
error:
|
||||||
sink_free(sink);
|
sink_free(sink);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user