diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-01-06 11:27:17 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-01-06 11:29:09 +0100 |
| commit | ef8591951aefccb668201f24aa481aa6cda834da (patch) | |
| tree | 03c6ea4d9f94e403d141eff3fea0c31a3d4dd678 /src/libsystemd | |
| parent | 6e689dc6eedea558df3d98da4477d58432d2d29c (diff) | |
| download | systemd-ef8591951aefccb668201f24aa481aa6cda834da.tar.gz | |
sd-event: don't mistake USEC_INFINITY passed in for overflow
Let's pass USEC_INFINITY from sd_event_source_set_time_relative() to
sd_event_source_set_time() instead of raising EOVERFLOW.
We should raise EOVERFLOW only if your addition fails, but not if the
input already is USEC_INFINITY, since it's an entirely valid operation
to have an infinite time-out, and we should support that.
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 6c15bc3ba7..cefe2a36b4 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -2726,6 +2726,9 @@ _public_ int sd_event_source_set_time_relative(sd_event_source *s, uint64_t usec assert_return(s, -EINVAL); assert_return(EVENT_SOURCE_IS_TIME(s->type), -EDOM); + if (usec == USEC_INFINITY) + return sd_event_source_set_time(s, USEC_INFINITY); + r = sd_event_now(s->event, event_source_type_to_clock(s->type), &t); if (r < 0) return r; |