diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-01-22 11:25:39 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-01-22 11:25:39 +0100 |
commit | 1fedcf59e0959b5e20bcd5a0ee9073e1185af315 (patch) | |
tree | 949bfa48a804069575cf12d6c18381fbc673ba27 /src/libsystemd/sd-bus/bus-message.c | |
parent | 4fc319887efb4c68ec5a308d583a94510382f686 (diff) |
bus: rename sd_bus_get_realtime_timestamp() to sd_bus_get_realtime_usec()
This brings the calls into similar style as the respective functions in
libsystemd-journal, and also is a bi shorter and more descriptive since
it clarifies the time unit used.
Diffstat (limited to 'src/libsystemd/sd-bus/bus-message.c')
-rw-r--r-- | src/libsystemd/sd-bus/bus-message.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 0c3913e2b0..2c25b3f5f1 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -880,19 +880,23 @@ _public_ const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m) { return &m->error; } -_public_ int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t *usec) { +_public_ int sd_bus_message_get_monotonic_usec(sd_bus_message *m, uint64_t *usec) { assert_return(m, -EINVAL); assert_return(usec, -EINVAL); - assert_return(m->monotonic > 0, -ENODATA); + + if (m->monotonic <= 0) + return -ENODATA; *usec = m->monotonic; return 0; } -_public_ int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *usec) { +_public_ int sd_bus_message_get_realtime_usec(sd_bus_message *m, uint64_t *usec) { assert_return(m, -EINVAL); assert_return(usec, -EINVAL); - assert_return(m->realtime > 0, -ENODATA); + + if (m->realtime <= 0) + return -ENODATA; *usec = m->realtime; return 0; @@ -901,7 +905,9 @@ _public_ int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t * _public_ int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t *seqnum) { assert_return(m, -EINVAL); assert_return(seqnum, -EINVAL); - assert_return(m->seqnum > 0, -ENODATA); + + if (m->seqnum <= 0) + return -ENODATA; *seqnum = m->seqnum; return 0; |