From 6a5c729ef481ec9e770c6ed039abaf0e14145802 Mon Sep 17 00:00:00 2001
From: Benjamin Robin <dev@benjarobin.fr>
Date: Mon, 15 Feb 2016 23:26:34 +0100
Subject: [PATCH] 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
---
 src/basic/time-util.c      | 7 +++----
 src/login/logind-session.c | 6 ++++--
 src/login/logind-user.c    | 6 ++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 4c811d41f..bcf1d177e 100644
--- 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 accf83d5f..ff2c95c55 100644
--- 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 1814a0e8f..8a557df35 100644
--- 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;
 }
-- 
2.30.2