sd-resolve: propagate timeouts in sd_resolve_wait() the same way as in sd_bus_wait...

Thankfully this is an internal API still, so we can mkae changes like
this.

diff --git a/src/basic/io-util.c b/src/basic/io-util.c
index 98bb1857d97f766f2c6b7553aa803c18247c6112..77c9bdc739d424076493ecfdc850fa2dc1f2e6f2 100644 (file)
--- a/src/basic/io-util.c
+++ b/src/basic/io-util.c
@@ -200,7 +200,6 @@ int fd_wait_for_event(int fd, int event, usec_t t) {
         r = ppoll(&pollfd, 1, t == USEC_INFINITY ? NULL : timespec_store(&ts, t), NULL);
         if (r < 0)
                 return -errno;
-
         if (r == 0)
                 return 0;
 

diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 986768e7b398dc4f2e08714fe68a1ea152cf9576..61a0a4c1de61ab5a2b359c5c39a795e5183d47d6 100644 (file)
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -890,6 +890,8 @@ _public_ int sd_resolve_wait(sd_resolve *resolve, uint64_t timeout_usec) {
 
         if (r < 0)
                 return r;
+        if (r == 0)
+                return -ETIMEDOUT;
 
         return sd_resolve_process(resolve);
 }