From: Lennart Poettering Date: Fri, 19 Aug 2022 10:40:24 +0000 (+0200) Subject: tree-wide: pass proper values (not bools) to sd_event_source_set_enabled() X-Git-Tag: v252-rc1~408 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ab1fb77e2e09baf7b34bf91604b995bb32ea5bf;p=thirdparty%2Fsystemd.git tree-wide: pass proper values (not bools) to sd_event_source_set_enabled() --- diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index e7afbd3eb3a..15b6844d5d4 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1480,7 +1480,7 @@ static int dispatch_sigterm(sd_event_source *es, const struct signalfd_siginfo * log_received_signal(LOG_INFO, si); - (void) sd_event_source_set_enabled(es, false); /* Make sure this handler is called at most once */ + (void) sd_event_source_set_enabled(es, SD_EVENT_OFF); /* Make sure this handler is called at most once */ /* So on one hand we want to ensure that SIGTERMs are definitely handled in appropriate, bounded * time. On the other hand we want that everything pending is first comprehensively processed and diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index d61707e729c..bb95ef08dc1 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3662,7 +3662,7 @@ static int prepare_callback(sd_event_source *s, void *userdata) { } } - r = sd_event_source_set_enabled(bus->time_event_source, r > 0); + r = sd_event_source_set_enabled(bus->time_event_source, r > 0 ? SD_EVENT_ONESHOT : SD_EVENT_OFF); if (r < 0) goto fail;