From: Michal Schmidt <mschmidt@redhat.com>
Date: Wed, 17 Dec 2014 14:46:30 +0000 (+0100)
Subject: journal: next_with_matches() now does not need a mapped object as input
X-Git-Tag: v219~935
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c2551e7105051f40b2bf77a5c1ecb2e720d78d77

journal: next_with_matches() now does not need a mapped object as input

Now that journal_file_next_entry() does not need a pointer to the
current object, next_with_matches() does not need it either.
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index bcd39be35..285e5e3fb 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -748,10 +748,6 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
 
                 cp = f->current_offset;
 
-                r = journal_file_move_to_object(f, OBJECT_ENTRY, cp, &c);
-                if (r < 0)
-                        return r;
-
                 r = next_with_matches(j, f, direction, &c, &cp);
                 if (r <= 0)
                         return r;