shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

Merge pull request #26197 from poettering/journal-file-size-t-fix

Browse Source 
journal: some trivial size_t array size fixes
This commit is contained in:
Lennart Poettering 2023-01-25 19:04:11 +01:00 committed by GitHub
commit 71df05fab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsystemd/sd-journal/journal-file.c
View File

@ -2248,7 +2248,7 @@ int journal_file_append_entry(
const dual_timestamp *ts,
const sd_id128_t *boot_id,
const struct iovec iovec[],
unsigned n_iovec,
size_t n_iovec,
uint64_t *seqnum,
Object **ret_object,
uint64_t *ret_offset) {
@ -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;
}

3
src/libsystemd/sd-journal/journal-file.h
View File

@ -254,7 +254,8 @@ int journal_file_append_entry(
JournalFile *f,
const dual_timestamp *ts,
const sd_id128_t *boot_id,
const struct iovec iovec[], unsigned n_iovec,
const struct iovec iovec[],
size_t n_iovec,
uint64_t *seqno,
Object **ret_object,
uint64_t *ret_offset);

6
src/libsystemd/sd-journal/journal-verify.c
View File

@ -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);