diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index ab25ff87bc..5d3f85e4cc 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -3351,10 +3351,8 @@ int journal_file_move_to_entry_by_monotonic( assert(f); r = find_data_object_by_boot_id(f, boot_id, &o, NULL); - if (r < 0) + if (r <= 0) return r; - if (r == 0) - return -ENOENT; return generic_array_bisect_plus_one( f, @@ -3546,10 +3544,8 @@ int journal_file_move_to_entry_by_monotonic_for_data( /* First, seek by time */ r = find_data_object_by_boot_id(f, boot_id, &o, &b); - if (r < 0) + if (r <= 0) return r; - if (r == 0) - return -ENOENT; r = generic_array_bisect_plus_one(f, le64toh(o->data.entry_offset), diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index 718d45af0e..1b9dcbdecb 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -667,7 +667,7 @@ static int find_location_for_match( return journal_file_move_to_entry_by_seqnum_for_data(f, d, j->current_location.seqnum, direction, ret, offset); if (j->current_location.monotonic_set) { r = journal_file_move_to_entry_by_monotonic_for_data(f, d, j->current_location.boot_id, j->current_location.monotonic, direction, ret, offset); - if (r != -ENOENT) + if (r != 0) return r; /* The data object might have been invalidated. */ @@ -762,7 +762,7 @@ static int find_location_with_matches( return journal_file_move_to_entry_by_seqnum(f, j->current_location.seqnum, direction, ret, offset); if (j->current_location.monotonic_set) { r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, ret, offset); - if (r != -ENOENT) + if (r != 0) return r; } if (j->current_location.realtime_set)