Merge pull request #2611 from 0xAX/deserialize-clkid

time-util: introduce deserialize_timestamp_value()

2 files changed, 4 insertions, 22 deletions

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 417b7f5d98..9874cdae5e 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -446,17 +446,8 @@ int session_load(Session *s) {
                 safe_close(fd);
         }
 
-        if (realtime) {
-                unsigned long long l;
-                if (sscanf(realtime, "%llu", &l) > 0)
-                        s->timestamp.realtime = l;
-        }
-
-        if (monotonic) {
-                unsigned long long l;
-                if (sscanf(monotonic, "%llu", &l) > 0)
-                        s->timestamp.monotonic = l;
-        }
+        deserialize_timestamp_value(realtime, &s->timestamp.realtime);
+        deserialize_timestamp_value(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 6b9c69cc45..aa27f73a87 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -321,17 +321,8 @@ int user_load(User *u) {
         if (s && s->display && display_is_local(s->display))
                 u->display = s;
 
-        if (realtime) {
-                unsigned long long l;
-                if (sscanf(realtime, "%llu", &l) > 0)
-                        u->timestamp.realtime = l;
-        }
-
-        if (monotonic) {
-                unsigned long long l;
-                if (sscanf(monotonic, "%llu", &l) > 0)
-                        u->timestamp.monotonic = l;
-        }
+        deserialize_timestamp_value(realtime, &u->timestamp.realtime);
+        deserialize_timestamp_value(monotonic, &u->timestamp.monotonic);
 
         return r;
 }