shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 10:51:20 +03:00
Code

journal: fix bisection logic for first entry

Browse Source
This commit is contained in:
Lennart Poettering 2012-07-12 17:36:04 +02:00
parent c4aff78b2d
commit a536e2613f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1275,7 +1275,11 @@ static int generic_array_bisect_plus_one(JournalFile *f,
r = test_object(f, extra, needle); r = test_object(f, extra, needle);
if (r < 0) if (r < 0)
return r; 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; Object *o;
r = journal_file_move_to_object(f, OBJECT_ENTRY, extra, &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; *idx = 0;
return 1; return 1;
} else if (r == TEST_RIGHT) }
return 0;
r = generic_array_bisect(f, first, n-1, needle, test_object, direction, ret, offset, idx); r = generic_array_bisect(f, first, n-1, needle, test_object, direction, ret, offset, idx);