diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-11-23 21:37:58 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-11-23 21:37:58 +0100 |
| commit | 36697dc0199e25f09b78090fcf5f1cf8a3648ffd (patch) | |
| tree | 7caef3bc1761327c366fc4a93a138e53fc692712 /src/core/dbus-timer.c | |
| parent | 8a1175118e7a2e60a6ec42624f915e26e821f4e8 (diff) | |
timer: implement calendar time events
Diffstat (limited to 'src/core/dbus-timer.c')
| -rw-r--r-- | src/core/dbus-timer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c index 84b823c9a4..11d18cbd83 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.c @@ -79,7 +79,8 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi /* s/Sec/USec/ */ l = strlen(t); - if (!(buf = new(char, l+2))) + buf = new(char, l+2); + if (!buf) return -ENOMEM; memcpy(buf, t, l-3); @@ -121,7 +122,8 @@ static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_timer_append_timer_result, timer_resu static const BusProperty bus_timer_properties[] = { { "Unit", bus_timer_append_unit, "s", 0 }, { "Timers", bus_timer_append_timers, "a(stt)", 0 }, - { "NextElapseUSec", bus_property_append_usec, "t", offsetof(Timer, next_elapse) }, + { "NextElapseUSec", bus_property_append_usec, "t", offsetof(Timer, next_elapse_monotonic) }, + { "NextElapseUSecRealtime", bus_property_append_usec, "t", offsetof(Timer, next_elapse_realtime) }, { "Result", bus_timer_append_timer_result,"s", offsetof(Timer, result) }, { NULL, } }; |