chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: pass timestamp info only to caller if he asked for it
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-message.c
diff --git
a/src/libsystemd/sd-bus/bus-message.c
b/src/libsystemd/sd-bus/bus-message.c
index 1a2039b8cd77a10e52046f635087c6cd6f2d57a5..2c25b3f5f1723c3a0a6370ec022e7c50958394ad 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-message.c
+++ b/
src/libsystemd/sd-bus/bus-message.c
@@
-880,24
+880,39
@@
_public_ const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m) {
return &m->error;
}
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, -EINVAL);
assert_return(usec, -EINVAL);
- assert_return(m->monotonic > 0, -ENODATA);
+
+ if (m->monotonic <= 0)
+ return -ENODATA;
*usec = m->monotonic;
return 0;
}
*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, -EINVAL);
assert_return(usec, -EINVAL);
- assert_return(m->realtime > 0, -ENODATA);
+
+ if (m->realtime <= 0)
+ return -ENODATA;
*usec = m->realtime;
return 0;
}
*usec = m->realtime;
return 0;
}
+_public_ int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t *seqnum) {
+ assert_return(m, -EINVAL);
+ assert_return(seqnum, -EINVAL);
+
+ if (m->seqnum <= 0)
+ return -ENODATA;
+
+ *seqnum = m->seqnum;
+ return 0;
+}
+
_public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) {
assert_return(m, NULL);
_public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) {
assert_return(m, NULL);