summaryrefslogtreecommitdiff
path: root/src/libelogind/sd-event
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-12 21:29:01 +0100
committerSven Eden <yamakuzure@gmx.net>2017-06-16 10:12:57 +0200
commitc5dee65877cc659b9710b2044006e0984fc57413 (patch)
tree0304b29a8c30622af0cde0e9333ce3d11be623ff /src/libelogind/sd-event
parent78cf14eb80347e61ba92852caa424b87409865ae (diff)
time-util: map ALARM clockids to non-ALARM clockids in now()
Fixes: #2597
Diffstat (limited to 'src/libelogind/sd-event')
-rw-r--r--src/libelogind/sd-event/sd-event.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c
index e32507942..805edb214 100644
--- a/src/libelogind/sd-event/sd-event.c
+++ b/src/libelogind/sd-event/sd-event.c
@@ -2805,9 +2805,13 @@ _public_ int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec) {
*usec = e->timestamp.monotonic;
break;
- default:
+ case CLOCK_BOOTTIME:
+ case CLOCK_BOOTTIME_ALARM:
*usec = e->timestamp_boottime;
break;
+
+ default:
+ assert_not_reached("Unknown clock?");
}
return 0;