diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index 9db87481f18..79fd9964fec 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -4226,12 +4226,12 @@ bool journal_file_rotate_suggested(JournalFile *f, usec_t max_file_usec, int log if (le64toh(f->header->n_data) * 4ULL > (le64toh(f->header->data_hash_table_size) / sizeof(HashItem)) * 3ULL) { log_ratelimit_full( log_level, JOURNAL_LOG_RATELIMIT, - "Data hash table of %s has a fill level at %.1f (%"PRIu64" of %"PRIu64" items, %llu file size, %"PRIu64" bytes per hash table item), suggesting rotation.", + "Data hash table of %s has a fill level at %.1f (%"PRIu64" of %"PRIu64" items, %"PRIu64" file size, %"PRIu64" bytes per hash table item), suggesting rotation.", f->path, 100.0 * (double) le64toh(f->header->n_data) / ((double) (le64toh(f->header->data_hash_table_size) / sizeof(HashItem))), le64toh(f->header->n_data), le64toh(f->header->data_hash_table_size) / sizeof(HashItem), - (unsigned long long) f->last_stat.st_size, + (uint64_t) f->last_stat.st_size, f->last_stat.st_size / le64toh(f->header->n_data)); return true; } diff --git a/src/libsystemd/sd-journal/journal-verify.c b/src/libsystemd/sd-journal/journal-verify.c index 1eca48536cf..b4ce3881a44 100644 --- a/src/libsystemd/sd-journal/journal-verify.c +++ b/src/libsystemd/sd-journal/journal-verify.c @@ -1377,11 +1377,11 @@ fail: if (show_progress) flush_progress(); - log_error("File corruption detected at %s:"OFSfmt" (of %llu bytes, %"PRIu64"%%).", + log_error("File corruption detected at %s:%"PRIu64" (of %"PRIu64" bytes, %"PRIu64"%%).", f->path, p, - (unsigned long long) f->last_stat.st_size, - 100 * p / f->last_stat.st_size); + (uint64_t) f->last_stat.st_size, + 100U * p / (uint64_t) f->last_stat.st_size); if (cache_data_fd) mmap_cache_fd_free(cache_data_fd);