diff options
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/logind-inhibit.c | 10 | ||||
| -rw-r--r-- | src/login/logind-seat.c | 6 | ||||
| -rw-r--r-- | src/login/logind-session.c | 16 | ||||
| -rw-r--r-- | src/login/logind-user.c | 10 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 042586d073..e261c8e366 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -98,12 +98,12 @@ int inhibitor_save(Inhibitor *i) { "# This is private data. Do not parse.\n" "WHAT=%s\n" "MODE=%s\n" - "UID=%lu\n" - "PID=%lu\n", + "UID="UID_FMT"\n" + "PID="PID_FMT"\n", inhibit_what_to_string(i->what), inhibit_mode_to_string(i->mode), - (unsigned long) i->uid, - (unsigned long) i->pid); + i->uid, + i->pid); if (i->who) { _cleanup_free_ char *cc = NULL; @@ -138,7 +138,7 @@ int inhibitor_save(Inhibitor *i) { finish: if (r < 0) - log_error("Failed to save inhibit data for %s: %s", i->id, strerror(-r)); + log_error("Failed to save inhibit data %s: %s", i->state_file, strerror(-r)); return r; } diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index b8f18c47a3..c7f112afb7 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -139,8 +139,8 @@ int seat_save(Seat *s) { fputs("UIDS=", f); LIST_FOREACH(sessions_by_seat, i, s->sessions) fprintf(f, - "%lu%c", - (unsigned long) i->user->uid, + UID_FMT"%c", + i->user->uid, i->sessions_by_seat_next ? ' ' : '\n'); } @@ -154,7 +154,7 @@ int seat_save(Seat *s) { finish: if (r < 0) - log_error("Failed to save seat data for %s: %s", s->id, strerror(-r)); + log_error("Failed to save seat data %s: %s", s->state_file, strerror(-r)); return r; } diff --git a/src/login/logind-session.c b/src/login/logind-session.c index ca2e48570c..bec59c044b 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -186,12 +186,12 @@ int session_save(Session *s) { fprintf(f, "# This is private data. Do not parse.\n" - "UID=%lu\n" + "UID="UID_FMT"\n" "USER=%s\n" "ACTIVE=%i\n" "STATE=%s\n" "REMOTE=%i\n", - (unsigned long) s->user->uid, + s->user->uid, s->user->name, session_is_active(s), session_state_to_string(session_get_state(s)), @@ -240,17 +240,17 @@ int session_save(Session *s) { fprintf(f, "POS=%u\n", s->pos); if (s->leader > 0) - fprintf(f, "LEADER=%lu\n", (unsigned long) s->leader); + fprintf(f, "LEADER="PID_FMT"\n", s->leader); if (s->audit_id > 0) fprintf(f, "AUDIT=%"PRIu32"\n", s->audit_id); if (dual_timestamp_is_set(&s->timestamp)) fprintf(f, - "REALTIME=%llu\n" - "MONOTONIC=%llu\n", - (unsigned long long) s->timestamp.realtime, - (unsigned long long) s->timestamp.monotonic); + "REALTIME="USEC_FMT"\n" + "MONOTONIC="USEC_FMT"\n", + s->timestamp.realtime, + s->timestamp.monotonic); if (s->controller) fprintf(f, "CONTROLLER=%s\n", s->controller); @@ -265,7 +265,7 @@ int session_save(Session *s) { finish: if (r < 0) - log_error("Failed to save session data for %s: %s", s->id, strerror(-r)); + log_error("Failed to save session data %s: %s", s->state_file, strerror(-r)); return r; } diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 0e46560d3f..bdb6915630 100644 --- 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, - "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; @@ -247,7 +247,7 @@ int user_save(User *u) { finish: if (r < 0) - log_error("Failed to save user data for %s: %s", u->name, strerror(-r)); + log_error("Failed to save user data %s: %s", u->state_file, strerror(-r)); return r; } |