diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-02-22 15:34:04 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2022-02-22 22:49:40 +0100 |
| commit | 0da36375ebd1c2768626692889b22c6adc3c4bab (patch) | |
| tree | 218e45829d1fb825758ea817c9b8d5f8c03deba7 /src/libsystemd | |
| parent | ec93eb48f2b23b9451c3d08064b07ee23e39a053 (diff) | |
| download | systemd-0da36375ebd1c2768626692889b22c6adc3c4bab.tar.gz | |
tree-wide: use timestamp_is_set() more
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-daemon/sd-daemon.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-journal/journal-vacuum.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index 4987eab916..c6380768bb 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -641,7 +641,7 @@ _public_ int sd_watchdog_enabled(int unset_environment, uint64_t *usec) { r = safe_atou64(s, &u); if (r < 0) goto finish; - if (u <= 0 || u >= USEC_INFINITY) { + if (!timestamp_is_set(u)) { r = -EINVAL; goto finish; } diff --git a/src/libsystemd/sd-journal/journal-vacuum.c b/src/libsystemd/sd-journal/journal-vacuum.c index 8296448ed5..eac3500202 100644 --- a/src/libsystemd/sd-journal/journal-vacuum.c +++ b/src/libsystemd/sd-journal/journal-vacuum.c @@ -64,15 +64,15 @@ static void patch_realtime( assert(realtime); x = timespec_load(&st->st_ctim); - if (x > 0 && x != USEC_INFINITY && x < *realtime) + if (timestamp_is_set(x) && x < *realtime) *realtime = x; x = timespec_load(&st->st_atim); - if (x > 0 && x != USEC_INFINITY && x < *realtime) + if (timestamp_is_set(x) && x < *realtime) *realtime = x; x = timespec_load(&st->st_mtim); - if (x > 0 && x != USEC_INFINITY && x < *realtime) + if (timestamp_is_set(x) && x < *realtime) *realtime = x; /* Let's read the original creation time, if possible. Ideally we'd just query the creation time the |