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 | |
| 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.
| -rw-r--r-- | src/libsystemd/libsystemd.sym | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-message.c | 16 | ||||
| -rw-r--r-- | src/systemd/sd-bus.h | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index bb3c1ab4a..951166afa 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -92,8 +92,8 @@ global: sd_bus_message_get_sender; sd_bus_message_get_error; sd_bus_message_get_errno; - sd_bus_message_get_monotonic_timestamp; - sd_bus_message_get_realtime_timestamp; + sd_bus_message_get_monotonic_usec; + sd_bus_message_get_realtime_usec; sd_bus_message_get_seqnum; sd_bus_message_get_creds; sd_bus_message_is_signal; diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 0c3913e2b..2c25b3f5f 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; diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 52627f655..4e6c32179 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -200,8 +200,8 @@ const char *sd_bus_message_get_sender(sd_bus_message *m); const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m); int sd_bus_message_get_errno(sd_bus_message *m); -int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t *usec); -int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *usec); +int sd_bus_message_get_monotonic_usec(sd_bus_message *m, uint64_t *usec); +int sd_bus_message_get_realtime_usec(sd_bus_message *m, uint64_t *usec); int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t* seqnum); sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m); /* do not unref the result */ |