logind: use deserialize_timestamp_value()
which is introduced in the ebf30a086d commit.
This commit is contained in:
@@ -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)
|
||||
|
||||
+2
-11
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user