From 76d04c3a3489192158c63a8638472fcac02e35b4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 16 Jul 2022 00:38:30 +0900 Subject: [PATCH] sd-event: drop redundant code The function `source_io_unregister()` will be anyway called in `source_disconnect()`. --- src/libsystemd/sd-event/sd-event.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index df48b3ce04..bdede44df3 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -2139,12 +2139,9 @@ static sd_event_source* event_source_free(sd_event_source *s) { * we still retain a valid event source object after * the callback. */ - if (s->dispatching) { - if (s->type == SOURCE_IO) - source_io_unregister(s); - + if (s->dispatching) source_disconnect(s); - } else + else source_free(s); return NULL;