From 02d30981b1bef116caee26ef3229fb910a88a394 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 14 Mar 2015 12:09:20 +0100 Subject: [PATCH] sd-event: sd_event_run - only return 0 on timeout sd_event_dispatch() returns 0 on FINISH, so let's eat that up. --- src/libsystemd/sd-event/sd-event.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 2529a8623..376477f27 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -2490,15 +2490,23 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) { assert_return(e->state == SD_EVENT_INITIAL, -EBUSY); r = sd_event_prepare(e); - if (r > 0) - return sd_event_dispatch(e); - else if (r < 0) + if (r > 0) { + r = sd_event_dispatch(e); + if (r < 0) + return r; + else + return 1; + } else if (r < 0) return r; r = sd_event_wait(e, timeout); - if (r > 0) - return sd_event_dispatch(e); - else + if (r > 0) { + r = sd_event_dispatch(e); + if (r < 0) + return r; + else + return 1; + } else return r; } -- 2.30.2