From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 18 Dec 2014 08:56:04 +0000 (+0100)
Subject: journal: remove redundant variable new_offset
X-Git-Tag: v219~940
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e499c9998bb42b792afb1acd3532fe975280c0fd

journal: remove redundant variable new_offset

The file's current_offset is already updated at this point, so let's use
it.
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 7ca0f839c..8cf6de651 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -787,7 +787,6 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
 
 static int real_journal_next(sd_journal *j, direction_t direction) {
         JournalFile *f, *new_file = NULL;
-        uint64_t new_offset = 0;
         uint64_t p = 0;
         Iterator i;
         Object *o;
@@ -819,16 +818,14 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
                         found = direction == DIRECTION_DOWN ? k < 0 : k > 0;
                 }
 
-                if (found) {
+                if (found)
                         new_file = f;
-                        new_offset = p;
-                }
         }
 
         if (!new_file)
                 return 0;
 
-        r = journal_file_move_to_object(new_file, OBJECT_ENTRY, new_offset, &o);
+        r = journal_file_move_to_object(new_file, OBJECT_ENTRY, new_file->current_offset, &o);
         if (r < 0)
                 return r;