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.

diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index bb3c1ab4af61660fe9ee27e3d46ca618669dddda..951166afa27999cefd7cabd53dea0f11f9aa8e0b 100644 (file)
--- 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_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;
         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 0c3913e2b0c6f2a9f8c60c86ecd3cc468a314e40..2c25b3f5f1723c3a0a6370ec022e7c50958394ad 100644 (file)
--- 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;
 }
 
         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;


@@ -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);
 _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;
 
         *seqnum = m->seqnum;
         return 0;

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 52627f65573b3bcaaa2251445c096103b47e29a8..4e6c321798a249ea2bf27e2db3dc727d100bc0b6 100644 (file)
--- 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);
 
 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 */
 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 */