From ccd06097c79218f7d5ea4c21721bbcbc7c467dca Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 30 Dec 2013 17:22:26 -0500 Subject: Use format patterns for usec_t, pid_t, nsec_t, usec_t It is nicer to predefine patterns using configure time check instead of using casts everywhere. Since we do not need to use any flags, include "%" in the format instead of excluding it like PRI* macros. --- src/bus-proxyd/bus-proxyd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/bus-proxyd') diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 28e8b44ccd..a14d7c822b 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -157,9 +157,9 @@ static int rename_service(sd_bus *a, sd_bus *b) { /* The status string gets the full command line ... */ sd_notifyf(false, - "STATUS=Processing requests from client PID %lu (%s); UID %lu (%s)", - (unsigned long) pid, p, - (unsigned long) uid, name); + "STATUS=Processing requests from client PID "PID_FMT" (%s); UID "UID_FMT" (%s)", + pid, p, + uid, name); /* ... and the argv line only the short comm */ if (arg_command_line_buffer) { @@ -167,17 +167,17 @@ static int rename_service(sd_bus *a, sd_bus *b) { m = strlen(arg_command_line_buffer); w = snprintf(arg_command_line_buffer, m, - "[PID %lu/%s; UID %lu/%s]", - (unsigned long) pid, comm, - (unsigned long) uid, name); + "[PID "PID_FMT"/%s; UID "UID_FMT"/%s]", + pid, comm, + uid, name); if (m > w) memset(arg_command_line_buffer + w, 0, m - w); } - log_debug("Running on behalf of PID %lu (%s), UID %lu (%s), %s", - (unsigned long) pid, p, - (unsigned long) uid, name, + log_debug("Running on behalf of PID "PID_FMT" (%s), UID "UID_FMT" (%s), %s", + pid, p, + uid, name, a->unique_name); ; return 0; -- cgit v1.2.3-54-g00ecf