From 1fc605b0e130149a44abfa38c33f4535cfe548ea Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Tue, 16 Dec 2014 20:54:56 +0100 Subject: [PATCH] journal: abstract the resetting of JournalFile's location --- src/journal/journal-file.c | 4 ++++ src/journal/journal-file.h | 1 + src/journal/sd-journal.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index efe14b0d9..8cbdbb9f9 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -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, diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index b14d0fc3e..3a19827fb 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -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); diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 72c9770a9..adaf402f4 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -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) { -- 2.30.2