diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index b0df06d75a..bbfe3631c3 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -1685,7 +1685,7 @@ int journal_file_find_data_object_with_hash( while (p > 0) { Object *o; - void *d; + const void *d; size_t rsize; r = journal_file_move_to_object(f, OBJECT_DATA, p, &o); @@ -1960,13 +1960,13 @@ static int journal_file_append_data( static int maybe_decompress_payload( JournalFile *f, - uint8_t *payload, + const uint8_t *payload, uint64_t size, Compression compression, const char *field, size_t field_length, size_t data_threshold, - void **ret_data, + const void **ret_data, size_t *ret_size) { assert(f); @@ -2039,7 +2039,7 @@ int journal_file_data_payload( const char *field, size_t field_length, size_t data_threshold, - void **ret_data, + const void **ret_data, size_t *ret_size) { uint64_t size; @@ -4501,7 +4501,7 @@ int journal_file_copy_entry( for (uint64_t i = 0; i < n; i++) { uint64_t h, q; - void *data; + const void *data; size_t l; Object *u; diff --git a/src/libsystemd/sd-journal/journal-file.h b/src/libsystemd/sd-journal/journal-file.h index 491236c569..2ec409eefd 100644 --- a/src/libsystemd/sd-journal/journal-file.h +++ b/src/libsystemd/sd-journal/journal-file.h @@ -220,7 +220,7 @@ int journal_file_data_payload( const char *field, size_t field_length, size_t data_threshold, - void **ret_data, + const void **ret_data, size_t *ret_size); static inline size_t journal_file_data_payload_offset(JournalFile *f) { diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index 92ae797529..403256eb81 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -2607,7 +2607,7 @@ static int journal_file_entry_get_machine_id(JournalFile *f, Object *o, sd_id128 uint64_t n = journal_file_entry_n_items(f, o); for (uint64_t i = 0; i < n; i++) { uint64_t p; - void *d; + const void *d; size_t l; int r; @@ -2913,7 +2913,7 @@ _public_ int sd_journal_get_data(sd_journal *j, const char *field, const void ** uint64_t n = journal_file_entry_n_items(f, o); for (uint64_t i = 0; i < n; i++) { uint64_t p; - void *d; + const void *d; size_t l; p = journal_file_entry_item_object_offset(f, o, i); @@ -2962,7 +2962,7 @@ _public_ int sd_journal_enumerate_data(sd_journal *j, const void **ret_data, siz for (uint64_t n = journal_file_entry_n_items(f, o); j->current_field < n; j->current_field++) { uint64_t p; - void *d; + const void *d; size_t l; p = journal_file_entry_item_object_offset(f, o, j->current_field); @@ -3452,7 +3452,7 @@ _public_ int sd_journal_enumerate_unique( for (;;) { JournalFile *of; Object *o; - void *odata; + const void *odata; size_t ol; bool found; int r;