diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-01-04 06:40:46 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:18:46 +0100 |
| commit | 1e6fb880e7b714bee3c348bcdcc8194a2abf5906 (patch) | |
| tree | d096b817442e0cb20b9b2015c9f81a6080c1fee0 /src/libelogind | |
| parent | 58764450160b12913bd66fe89901f0a37dec2774 (diff) | |
Prep v225: Applying various fixes and changes to src/libelogind/sd-event that got lost during git am transfer.
Diffstat (limited to 'src/libelogind')
| -rw-r--r-- | src/libelogind/sd-event/sd-event.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c index 629f78032..871ea8d60 100644 --- a/src/libelogind/sd-event/sd-event.c +++ b/src/libelogind/sd-event/sd-event.c @@ -819,7 +819,7 @@ _public_ int sd_event_add_io( int r; assert_return(e, -EINVAL); - assert_return(fd >= 0, -EINVAL); + assert_return(fd >= 0, -EBADF); assert_return(!(events & ~(EPOLLIN|EPOLLOUT|EPOLLRDHUP|EPOLLPRI|EPOLLERR|EPOLLHUP|EPOLLET)), -EINVAL); assert_return(callback, -EINVAL); assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); @@ -1323,7 +1323,7 @@ _public_ int sd_event_source_set_io_fd(sd_event_source *s, int fd) { int r; assert_return(s, -EINVAL); - assert_return(fd >= 0, -EINVAL); + assert_return(fd >= 0, -EBADF); assert_return(s->type == SOURCE_IO, -EDOM); assert_return(!event_pid_changed(s->event), -ECHILD); @@ -2604,9 +2604,12 @@ _public_ int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec) { assert_return(usec, -EINVAL); assert_return(!event_pid_changed(e), -ECHILD); - /* If we haven't run yet, just get the actual time */ - if (!dual_timestamp_is_set(&e->timestamp)) - return -ENODATA; + if (!dual_timestamp_is_set(&e->timestamp)) { + /* Implicitly fall back to now() if we never ran + * before and thus have no cached time. */ + *usec = now(clock); + return 1; + } switch (clock) { |