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/journal | |
| parent | 8facc3498ed037f842891ff55d1f60fe834f4ba0 (diff) | |
Assorted format fixes
Types used for pids and uids in various interfaces are unpredictable.
Too bad.
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/compress.c | 8 | ||||
| -rw-r--r-- | src/journal/journal-send.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-audit.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/journal/compress.c b/src/journal/compress.c index 9440fcd60..6923753f8 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -356,7 +356,7 @@ int compress_stream_xz(int fdf, int fdt, off_t max_bytes) { ret = lzma_easy_encoder(&s, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC64); if (ret != LZMA_OK) { - log_error("Failed to initialize XZ encoder: code %d", ret); + log_error("Failed to initialize XZ encoder: code %u", ret); return -EINVAL; } @@ -391,7 +391,7 @@ int compress_stream_xz(int fdf, int fdt, off_t max_bytes) { ret = lzma_code(&s, action); if (ret != LZMA_OK && ret != LZMA_STREAM_END) { - log_error("Compression failed: code %d", ret); + log_error("Compression failed: code %u", ret); return -EBADMSG; } @@ -512,7 +512,7 @@ int decompress_stream_xz(int fdf, int fdt, off_t max_bytes) { ret = lzma_stream_decoder(&s, UINT64_MAX, 0); if (ret != LZMA_OK) { - log_error("Failed to initialize XZ decoder: code %d", ret); + log_error("Failed to initialize XZ decoder: code %u", ret); return -ENOMEM; } @@ -538,7 +538,7 @@ int decompress_stream_xz(int fdf, int fdt, off_t max_bytes) { ret = lzma_code(&s, action); if (ret != LZMA_OK && ret != LZMA_STREAM_END) { - log_error("Decompression failed: code %d", ret); + log_error("Decompression failed: code %u", ret); return -EBADMSG; } diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index 56a96c55d..65fefd25a 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -384,7 +384,7 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove memcpy(buffer + 8 + k - 2, ": ", 2); } - snprintf(error, sizeof(error), "ERRNO=%u", _saved_errno_); + snprintf(error, sizeof(error), "ERRNO=%i", _saved_errno_); char_array_0(error); IOVEC_SET_STRING(iov[skip+0], "PRIORITY=3"); diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c index 9d2173843..c2f1545cc 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -360,7 +360,7 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s if (!p) return; - if (sscanf(p, "(%" PRIi64 ".%" PRIi64 ":%" PRIi64 "):%n", + if (sscanf(p, "(%" PRIu64 ".%" PRIu64 ":%" PRIu64 "):%n", &seconds, &msec, &id, |