chiark / gitweb /
journal: fix bisection logic for first entry
authorLennart Poettering <lennart@poettering.net>
Thu, 12 Jul 2012 15:36:04 +0000 (17:36 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 12 Jul 2012 22:32:32 +0000 (00:32 +0200)
src/journal/journal-file.c

index db64a32..c468b22 100644 (file)
@@ -1275,7 +1275,11 @@ static int generic_array_bisect_plus_one(JournalFile *f,
         r = test_object(f, extra, needle);
         if (r < 0)
                 return r;
-        else if (r == TEST_FOUND) {
+
+        if (r == TEST_FOUND)
+                r = direction == DIRECTION_DOWN ? TEST_RIGHT : TEST_LEFT;
+
+        if (r == TEST_RIGHT) {
                 Object *o;
 
                 r = journal_file_move_to_object(f, OBJECT_ENTRY, extra, &o);
@@ -1292,8 +1296,7 @@ static int generic_array_bisect_plus_one(JournalFile *f,
                         *idx = 0;
 
                 return 1;
-        } else if (r == TEST_RIGHT)
-                return 0;
+        }
 
         r = generic_array_bisect(f, first, n-1, needle, test_object, direction, ret, offset, idx);