diff options
author | Kay Sievers <kay@vrfy.org> | 2014-07-29 12:23:31 +0200 |
---|---|---|
committer | Kay Sievers <kay@vrfy.org> | 2014-07-29 13:20:20 +0200 |
commit | 3a43da2832dc5360a638d043f469a6dcbe025582 (patch) | |
tree | e3b60e840bb087c1af7f458676e3ab6bf04ea49e /src/libsystemd/sd-bus | |
parent | cf347234ae78630dd4aad8907f027965e7fb9040 (diff) |
time-util: add and use USEC/NSEC_INFINIY
Diffstat (limited to 'src/libsystemd/sd-bus')
-rw-r--r-- | src/libsystemd/sd-bus/bus-util.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/test-bus-kernel-benchmark.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c index 6441c5b162..d41e53753f 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1265,7 +1265,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen if (r < 0) return bus_log_create_error(r); - r = sd_bus_message_append(m, "v", "t", (usec_t) -1); + r = sd_bus_message_append(m, "v", "t", USEC_INFINITY); } else if (endswith(eq, "%")) { double percent; diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 28fc19e2cf..0fadd1699e 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -2646,7 +2646,7 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { struct pollfd p[2] = {}; int r, e, n; struct timespec ts; - usec_t m = (usec_t) -1; + usec_t m = USEC_INFINITY; assert(bus); diff --git a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c index 90257d4f3c..cd88e67c9e 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c @@ -47,7 +47,7 @@ static void server(sd_bus *b, size_t *result) { assert_se(r >= 0); if (r == 0) - assert_se(sd_bus_wait(b, (usec_t) -1) >= 0); + assert_se(sd_bus_wait(b, USEC_INFINITY) >= 0); if (!m) continue; |