Update some message formats

Use PID_FMT/USEC_FMT/... in more places.

Also update logind error messages to print the full path to a file that
failed. This should make debugging easier for people who do not know
off the top of their head where logind stores it state.

1 files changed, 3 insertions, 3 deletions

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;
 }