summaryrefslogtreecommitdiff
path: root/src/login/logind-user.c
diff options
context:
space:
mode:
authorBenjamin Robin <dev@benjarobin.fr>2016-02-15 23:26:34 +0100
committerBenjamin Robin <dev@benjarobin.fr>2016-02-15 23:26:34 +0100
commitb895a7353b739e7186f6f51f3a415485b5afd80f (patch)
treeb49160f789b98e93b979ce4cc53c47f5ee871880 /src/login/logind-user.c
parent11ab173d4067a4ed6fab811ba2159456053fd4c1 (diff)
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
Diffstat (limited to 'src/login/logind-user.c')
-rw-r--r--src/login/logind-user.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index aa27f73a87..a826321bf0 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -321,8 +321,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;
}