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: shorten code a bit

Browse Source
This commit is contained in:
Yu Watanabe 2022-06-27 11:28:36 +09:00
parent 909a6b87b0
commit 586fb79e27
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,7 +799,6 @@ static int journal_file_check_object(JournalFile *f, uint64_t offset, Object *o)
int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret) {
int r;
void *t;
Object *o;
uint64_t s;
@ -817,11 +816,10 @@ int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset
"Attempt to move to object located in file header: %" PRIu64,
offset);
r = journal_file_move_to(f, type, false, offset, sizeof(ObjectHeader), &t);
r = journal_file_move_to(f, type, false, offset, sizeof(ObjectHeader), (void**) &o);
if (r < 0)
return r;
o = (Object*) t;
s = le64toh(READ_NOW(o->object.size));
if (s == 0)
@ -848,12 +846,10 @@ int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset
"Attempt to move to object of unexpected type: %" PRIu64,
offset);
r = journal_file_move_to(f, type, false, offset, s, &t);
r = journal_file_move_to(f, type, false, offset, s, (void**) &o);
if (r < 0)
return r;
o = (Object*) t;
r = journal_file_check_object(f, offset, o);
if (r < 0)
return r;
@ -976,7 +972,6 @@ int journal_file_append_object(
int r;
uint64_t p;
Object *o;
void *t;
assert(f);
assert(f->header);
@ -995,11 +990,10 @@ int journal_file_append_object(
if (r < 0)
return r;
r = journal_file_move_to(f, type, false, p, size, &t);
r = journal_file_move_to(f, type, false, p, size, (void**) &o);
if (r < 0)
return r;
o = (Object*) t;
o->object = (ObjectHeader) {
.type = type,
.size = htole64(size),