shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-31 05:47:30 +03:00
Code

journal: Use more structured initialization

Browse Source
This commit is contained in:
Daan De Meyer 2021-11-11 15:35:28 +00:00
parent 86e68f3814
commit d164ac771e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2170,8 +2170,10 @@ int journal_file_append_entry(
else
xor_hash ^= le64toh(o->data.hash);
items[i].object_offset = htole64(p);
items[i].hash = o->data.hash;
items[i] = (EntryItem) {
.object_offset = htole64(p),
.hash = o->data.hash,
};
}
/* Order by the position on disk, in order to improve seek
@ -3867,8 +3869,10 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
if (!to->writable)
return -EPERM;
ts.monotonic = le64toh(o->entry.monotonic);
ts.realtime = le64toh(o->entry.realtime);
ts = (dual_timestamp) {
.monotonic = le64toh(o->entry.monotonic),
.realtime = le64toh(o->entry.realtime),
};
boot_id = &o->entry.boot_id;
n = journal_file_entry_n_items(o);
@ -3931,8 +3935,10 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
else
xor_hash ^= le64toh(u->data.hash);
items[i].object_offset = htole64(h);
items[i].hash = u->data.hash;
items[i] = (EntryItem) {
.object_offset = htole64(h),
.hash = u->data.hash,
};
r = journal_file_move_to_object(from, OBJECT_ENTRY, p, &o);
if (r < 0)