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

journal: abstract the resetting of JournalFile's location

Browse Source
This commit is contained in:
Michal Schmidt 2014-12-16 20:54:56 +01:00
parent 99cc7653a8
commit 1fc605b0e1
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/journal/journal-file.c
View File

@ -1928,6 +1928,10 @@ int journal_file_move_to_entry_by_monotonic(
ret, offset, NULL);
}
void journal_file_reset_location(JournalFile *f) {
f->current_offset = 0;
}
int journal_file_next_entry(
JournalFile *f,
Object *o, uint64_t p,

1
src/journal/journal-file.h
View File

@ -189,6 +189,7 @@ int journal_file_find_data_object_with_hash(JournalFile *f, const void *data, ui
int journal_file_find_field_object(JournalFile *f, const void *field, uint64_t size, Object **ret, uint64_t *offset);
int journal_file_find_field_object_with_hash(JournalFile *f, const void *field, uint64_t size, uint64_t hash, Object **ret, uint64_t *offset);
void journal_file_reset_location(JournalFile *f);
int journal_file_next_entry(JournalFile *f, Object *o, uint64_t p, direction_t direction, Object **ret, uint64_t *offset);
int journal_file_next_entry_for_data(JournalFile *f, Object *o, uint64_t p, uint64_t data_offset, direction_t direction, Object **ret, uint64_t *offset);

2
src/journal/sd-journal.c
View File

@ -87,7 +87,7 @@ static void detach_location(sd_journal *j) {
j->current_field = 0;
ORDERED_HASHMAP_FOREACH(f, j->files, i)
f->current_offset = 0;
journal_file_reset_location(f);
}
static void reset_location(sd_journal *j) {