time-util: Rename and fix call of deserialize_timestamp_value()

The deserialize_timestamp_value() is renamed timestamp_deserialize() to be more
consistent with dual_timestamp_deserialize()
And add the NULL check back on realtime and monotonic

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 4c811d41f448a1f312e0105db8d1f40c012f2b1a..bcf1d177e30c5a634c840d589db99a2fad20f6e6 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -442,7 +442,7 @@ int dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
         assert(t);
 
         if (sscanf(value, "%llu %llu", &a, &b) != 2) {
-                log_debug("Failed to parse finish timestamp value %s.", value);
+                log_debug("Failed to parse dual timestamp value \"%s\": %m", value);
                 return -EINVAL;
         }
 
@@ -452,15 +452,14 @@ int dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
         return 0;
 }
 
-int deserialize_timestamp_value(const char *value, usec_t *timestamp) {
+int timestamp_deserialize(const char *value, usec_t *timestamp) {
         int r;
 
         assert(value);
 
         r = safe_atou64(value, timestamp);
-
         if (r < 0)
-                return log_debug_errno(r, "Failed to parse finish timestamp value \"%s\": %m", value);
+                return log_debug_errno(r, "Failed to parse timestamp value \"%s\": %m", value);
 
         return r;
 }

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index accf83d5f110d341008696476e2be8d87732dcfa..ff2c95c55d60c3192bbbd36690dd2a1af773bcc0 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -452,8 +452,10 @@ int session_load(Session *s) {
                 safe_close(fd);
         }
 
-        deserialize_timestamp_value(realtime, &s->timestamp.realtime);
-        deserialize_timestamp_value(monotonic, &s->timestamp.monotonic);
+        if (realtime)
+                timestamp_deserialize(realtime, &s->timestamp.realtime);
+        if (monotonic)
+                timestamp_deserialize(monotonic, &s->timestamp.monotonic);
 
         if (controller) {
                 if (bus_name_has_owner(s->manager->bus, controller, NULL) > 0)

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 1814a0e8f52290036739868c19b80365e1ee6a14..8a557df35be020d805f1450f1e7615239091dbf7 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -326,8 +326,10 @@ int user_load(User *u) {
         if (s && s->display && display_is_local(s->display))
                 u->display = s;
 
-        deserialize_timestamp_value(realtime, &u->timestamp.realtime);
-        deserialize_timestamp_value(monotonic, &u->timestamp.monotonic);
+        if (realtime)
+                timestamp_deserialize(realtime, &u->timestamp.realtime);
+        if (monotonic)
+                timestamp_deserialize(monotonic, &u->timestamp.monotonic);
 
         return r;
 }