From 90b2de37b80603168f4e9c9c81cff7eea4efa21a Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 3 Feb 2014 19:31:53 -0500 Subject: 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. --- src/login/logind-inhibit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/login/logind-inhibit.c') 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; } -- cgit v1.2.3-54-g00ecf