diff options
| author | Daniel Mack <github@zonque.org> | 2016-03-01 10:06:51 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2016-03-01 10:06:51 +0100 |
| commit | 114761866a5e9376277daf847663d23361ffe0c0 (patch) | |
| tree | 44138435bed8964f10991d5e5689a9d9ac26ff4a | |
| parent | 6014237390d5d9a20a274d4fcd9c84669cacca83 (diff) | |
| parent | 82e24b0068feb0dbf6274d889d0368fe4212285f (diff) | |
| download | systemd-114761866a5e9376277daf847663d23361ffe0c0.tar.gz | |
Merge pull request #2773 from eliasp/type-warnings
Use `PRIu64` to print `uint64_t` in log msgs
| -rw-r--r-- | src/journal/compress.c | 5 | ||||
| -rw-r--r-- | src/journal/sd-journal.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/journal/compress.c b/src/journal/compress.c index 1933b87b00..c43849c46a 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -17,6 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include <inttypes.h> #include <stdlib.h> #include <string.h> #include <sys/mman.h> @@ -498,7 +499,7 @@ int compress_stream_lz4(int fdf, int fdt, uint64_t max_bytes) { total_out += n; if (max_bytes != (uint64_t) -1 && total_out > (size_t) max_bytes) { - log_debug("Compressed stream longer than %zd bytes", max_bytes); + log_debug("Compressed stream longer than %"PRIu64" bytes", max_bytes); return -EFBIG; } @@ -649,7 +650,7 @@ int decompress_stream_lz4(int in, int out, uint64_t max_bytes) { total_out += produced; if (max_bytes != (uint64_t) -1 && total_out > (size_t) max_bytes) { - log_debug("Decompressed stream longer than %zd bytes", max_bytes); + log_debug("Decompressed stream longer than %"PRIu64" bytes", max_bytes); r = -EFBIG; goto cleanup; } diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index ac75e39312..3c21d4129e 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -19,6 +19,7 @@ #include <errno.h> #include <fcntl.h> +#include <inttypes.h> #include <linux/magic.h> #include <poll.h> #include <stddef.h> @@ -1957,7 +1958,7 @@ _public_ int sd_journal_get_data(sd_journal *j, const char *field, const void ** &f->compress_buffer, &f->compress_buffer_size, field, field_length, '='); if (r < 0) - log_debug_errno(r, "Cannot decompress %s object of length %zu at offset "OFSfmt": %m", + log_debug_errno(r, "Cannot decompress %s object of length %"PRIu64" at offset "OFSfmt": %m", object_compressed_to_string(compression), l, p); else if (r > 0) { |