diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-20 22:22:15 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-22 01:14:52 -0500 |
| commit | 1fa2f38f0f011010bf57522b42fcc168856a7003 (patch) | |
| tree | 7bd1a23716379826ef6cd37f98c2f02470a2d5c4 /src/libsystemd | |
| parent | 8facc3498ed037f842891ff55d1f60fe834f4ba0 (diff) | |
Assorted format fixes
Types used for pids and uids in various interfaces are unpredictable.
Too bad.
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-dump.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-hwdb/sd-hwdb.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-message.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index afdf52fed4..8fba7ac679 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -69,7 +69,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) { if (flags & BUS_MESSAGE_DUMP_WITH_HEADER) { fprintf(f, - "%s%s%s Type=%s%s%s Endian=%c Flags=%u Version=%u Priority=%lli", + "%s%s%s Type=%s%s%s Endian=%c Flags=%u Version=%u Priority=%"PRIi64, m->header->type == SD_BUS_MESSAGE_METHOD_ERROR ? ansi_highlight_red() : m->header->type == SD_BUS_MESSAGE_METHOD_RETURN ? ansi_highlight_green() : m->header->type != SD_BUS_MESSAGE_SIGNAL ? ansi_highlight() : "", draw_special_char(DRAW_TRIANGULAR_BULLET), ansi_highlight_off(), @@ -77,7 +77,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) { m->header->endian, m->header->flags, m->header->version, - (long long) m->priority); + m->priority); /* Display synthetic message serial number in a more readable * format than (uint32_t) -1 */ diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c index a16807f9d5..61c7b446b3 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/sd-hwdb/sd-hwdb.c @@ -324,7 +324,7 @@ _public_ int sd_hwdb_new(sd_hwdb **ret) { log_debug("=== trie on-disk ==="); log_debug("tool version: %"PRIu64, le64toh(hwdb->head->tool_version)); - log_debug("file size: %8"PRIu64" bytes", hwdb->st.st_size); + log_debug("file size: %8"PRIi64" bytes", hwdb->st.st_size); log_debug("header size %8"PRIu64" bytes", le64toh(hwdb->head->header_size)); log_debug("strings %8"PRIu64" bytes", le64toh(hwdb->head->strings_len)); log_debug("nodes %8"PRIu64" bytes", le64toh(hwdb->head->nodes_len)); diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index 484613351d..1f44c341aa 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -1366,7 +1366,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool if (ucred->pid == 0) auth = true; else - log_debug("rtnl: ignoring message from pid %u", ucred->pid); + log_debug("rtnl: ignoring message from PID "PID_FMT, ucred->pid); } else if (cmsg->cmsg_level == SOL_NETLINK && cmsg->cmsg_type == NETLINK_PKTINFO && cmsg->cmsg_len == CMSG_LEN(sizeof(struct nl_pktinfo))) { |