From: Yu Watanabe Date: Wed, 12 Oct 2022 06:37:00 +0000 (+0900) Subject: sd-journal: rename next_hash_offset() -> get_next_hash_offset() X-Git-Tag: v252-rc2~55^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a77f21d294548d30808cfac3b2e389176926fdc;p=thirdparty%2Fsystemd.git sd-journal: rename next_hash_offset() -> get_next_hash_offset() As the function name conflicts with one of its argument. --- diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index 7dbbd4889c4..8d71847c23d 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -1252,7 +1252,7 @@ static int journal_file_link_data( return 0; } -static int next_hash_offset( +static int get_next_hash_offset( JournalFile *f, uint64_t *p, le64_t *next_hash_offset, @@ -1326,7 +1326,7 @@ int journal_file_find_field_object_with_hash( return 1; } - r = next_hash_offset( + r = get_next_hash_offset( f, &p, &o->field.next_hash_offset, @@ -1427,7 +1427,7 @@ int journal_file_find_data_object_with_hash( } next: - r = next_hash_offset( + r = get_next_hash_offset( f, &p, &o->data.next_hash_offset,