summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/login/logind-session.c13
-rw-r--r--src/login/logind-user.c13
2 files changed, 4 insertions, 22 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index c37e87565..accf83d5f 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -452,17 +452,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 b6daf6529..1814a0e8f 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -326,17 +326,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;
}