shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 03:25:31 +03:00
Code

sd-journal: drop unused argument from journal_file_check_object()

Browse Source 
And rename the function.
This commit is contained in:
Yu Watanabe 2022-06-27 11:53:43 +09:00
parent 586fb79e27
commit 31fdd89fc6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,8 +651,7 @@ static uint64_t minimum_header_size(Object *o) {
/* Lightweight object checks. We want this to be fast, so that we won't
* slowdown every journal_file_move_to_object() call too much. */
static int journal_file_check_object(JournalFile *f, uint64_t offset, Object *o) {
assert(f);
static int check_object(Object *o, uint64_t offset) {
assert(o);
switch (o->object.type) {
@ -850,7 +849,7 @@ int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset
if (r < 0)
return r;
r = journal_file_check_object(f, offset, o);
r = check_object(o, offset);
if (r < 0)
return r;
@ -921,7 +920,7 @@ int journal_file_read_object_header(JournalFile *f, ObjectType type, uint64_t of
"Attempt to read object of unexpected type: %" PRIu64,
offset);
r = journal_file_check_object(f, offset, &o);
r = check_object(&o, offset);
if (r < 0)
return r;