chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update some message formats
[elogind.git]
/
src
/
login
/
logind-user.c
diff --git
a/src/login/logind-user.c
b/src/login/logind-user.c
index 6ba8d9807bc16374284cd137bd3079251127d74e..bdb69156300d684947cc163630a19780516162eb 100644
(file)
--- a/
src/login/logind-user.c
+++ b/
src/login/logind-user.c
@@
-145,10
+145,10
@@
int user_save(User *u) {
if (dual_timestamp_is_set(&u->timestamp))
fprintf(f,
if (dual_timestamp_is_set(&u->timestamp))
fprintf(f,
- "REALTIME=
%llu
\n"
- "MONOTONIC=
%llu
\n",
-
(unsigned long long)
u->timestamp.realtime,
-
(unsigned long long)
u->timestamp.monotonic);
+ "REALTIME=
"USEC_FMT"
\n"
+ "MONOTONIC=
"USEC_FMT"
\n",
+ u->timestamp.realtime,
+ u->timestamp.monotonic);
if (u->sessions) {
Session *i;
if (u->sessions) {
Session *i;
@@
-247,7
+247,7
@@
int user_save(User *u) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error("Failed to save user data
for %s: %s", u->nam
e, strerror(-r));
+ log_error("Failed to save user data
%s: %s", u->state_fil
e, strerror(-r));
return r;
}
return r;
}
@@
-618,12
+618,6
@@
bool user_check_gc(User *u, bool drop_not_started) {
if (u->service_job && manager_job_is_active(u->manager, u->service_job))
return true;
if (u->service_job && manager_job_is_active(u->manager, u->service_job))
return true;
- if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0)
- return true;
-
- if (u->service && manager_unit_is_active(u->manager, u->service) != 0)
- return true;
-
return false;
}
return false;
}
@@
-643,9
+637,6
@@
UserState user_get_state(User *u) {
assert(u);
assert(u);
- if (u->closing)
- return USER_CLOSING;
-
if (u->slice_job || u->service_job)
return USER_OPENING;
if (u->slice_job || u->service_job)
return USER_OPENING;