From: Yu Watanabe Date: Fri, 15 Jul 2022 15:38:30 +0000 (+0900) Subject: sd-event: drop redundant code X-Git-Tag: v252-rc1~628^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76d04c3a3489192158c63a8638472fcac02e35b4;p=thirdparty%2Fsystemd.git sd-event: drop redundant code The function `source_io_unregister()` will be anyway called in `source_disconnect()`. --- diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index df48b3ce046..bdede44df3b 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;