From 90b2de37b80603168f4e9c9c81cff7eea4efa21a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 3 Feb 2014 19:31:53 -0500 Subject: [PATCH] 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 +++++----- src/login/logind-seat.c | 6 +++--- src/login/logind-session.c | 16 ++++++++-------- src/login/logind-user.c | 10 +++++----- src/machine/machine.c | 12 ++++++------ src/shutdownd/shutdownd.c | 4 ++-- src/udev/udevadm-hwdb.c | 18 +++++++++--------- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 042586d07..e261c8e36 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 b8f18c47a..c7f112afb 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 ca2e48570..bec59c044 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 0e46560d3..bdb691563 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; } diff --git a/src/machine/machine.c b/src/machine/machine.c index cf3ef1545..0791ba8a9 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -139,17 +139,17 @@ int machine_save(Machine *m) { fprintf(f, "ID=" SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(m->id)); if (m->leader != 0) - fprintf(f, "LEADER=%lu\n", (unsigned long) m->leader); + fprintf(f, "LEADER="PID_FMT"\n", m->leader); if (m->class != _MACHINE_CLASS_INVALID) fprintf(f, "CLASS=%s\n", machine_class_to_string(m->class)); if (dual_timestamp_is_set(&m->timestamp)) fprintf(f, - "REALTIME=%llu\n" - "MONOTONIC=%llu\n", - (unsigned long long) m->timestamp.realtime, - (unsigned long long) m->timestamp.monotonic); + "REALTIME="USEC_FMT"\n" + "MONOTONIC="USEC_FMT"\n", + m->timestamp.realtime, + m->timestamp.monotonic); fflush(f); @@ -161,7 +161,7 @@ int machine_save(Machine *m) { finish: if (r < 0) - log_error("Failed to save machine data for %s: %s", m->name, strerror(-r)); + log_error("Failed to save machine data %s: %s", m->state_file, strerror(-r)); return r; } diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c index 461a7261f..4a1719849 100644 --- a/src/shutdownd/shutdownd.c +++ b/src/shutdownd/shutdownd.c @@ -224,10 +224,10 @@ static int update_schedule_file(struct sd_shutdown_command *c) { fchmod(fileno(f), 0644); fprintf(f, - "USEC=%llu\n" + "USEC="USEC_FMT"\n" "WARN_WALL=%i\n" "MODE=%s\n", - (unsigned long long) c->usec, + c->usec, c->warn_wall, mode_to_string(c->mode)); diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c index 1f7f0c729..a22de1da4 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -390,16 +390,16 @@ static int trie_store(struct trie *trie, const char *filename) { } log_debug("=== trie on-disk ==="); - log_debug("size: %8llu bytes", (unsigned long long)size); + log_debug("size: %8"PRIu64" bytes", size); log_debug("header: %8zu bytes", sizeof(struct trie_header_f)); - log_debug("nodes: %8llu bytes (%8llu)", - (unsigned long long)t.nodes_count * sizeof(struct trie_node_f), (unsigned long long)t.nodes_count); - log_debug("child pointers: %8llu bytes (%8llu)", - (unsigned long long)t.children_count * sizeof(struct trie_child_entry_f), (unsigned long long)t.children_count); - log_debug("value pointers: %8llu bytes (%8llu)", - (unsigned long long)t.values_count * sizeof(struct trie_value_entry_f), (unsigned long long)t.values_count); - log_debug("string store: %8llu bytes", (unsigned long long)trie->strings->len); - log_debug("strings start: %8llu", (unsigned long long) t.strings_off); + log_debug("nodes: %8"PRIu64" bytes (%8"PRIu64")", + t.nodes_count * sizeof(struct trie_node_f), t.nodes_count); + log_debug("child pointers: %8"PRIu64" bytes (%8"PRIu64")", + t.children_count * sizeof(struct trie_child_entry_f), t.children_count); + log_debug("value pointers: %8"PRIu64" bytes (%8"PRIu64")", + t.values_count * sizeof(struct trie_value_entry_f), t.values_count); + log_debug("string store: %8zu bytes", trie->strings->len); + log_debug("strings start: %8"PRIu64, t.strings_off); out: free(filename_tmp); return err; -- 2.30.2