diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-01-27 20:12:14 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-01-27 20:12:59 +0100 |
commit | 968d3d242cc9256eaca9a18155a744b575159cbd (patch) | |
tree | c421f3664e792ccf34a0aeeadbe2b53060610bd4 /src/shared | |
parent | ff975efb2e88dcd5221a2f0d76c4c87e85b821a8 (diff) |
resolve: update sd-resolve to match the other APIs in style and functionality
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/util.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 5551714a36..cdd9a48866 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -3869,13 +3869,16 @@ int pipe_eof(int fd) { } int fd_wait_for_event(int fd, int event, usec_t t) { - int r; + struct pollfd pollfd = { .fd = fd, .events = event, }; - r = poll(&pollfd, 1, t == (usec_t) -1 ? -1 : (int) (t / USEC_PER_MSEC)); + struct timespec ts; + int r; + + r = ppoll(&pollfd, 1, t == (usec_t) -1 ? NULL : timespec_store(&ts, t), NULL); if (r < 0) return -errno; |