SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-journal: merge two bump_entry_array() calls

Browse Source 
No functional changes, just refactoring.
This commit is contained in:
Yu Watanabe
2023-09-30 20:10:15 +09:00
parent b7264911aa
commit b63f09e4ee
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/journal-file.c
+5 -10
View File
@@ -2752,7 +2752,7 @@ static int generic_array_get(
uint64_t a, t = 0, k;
ChainCacheItem *ci;
Object *o;
Object *o = NULL;
int r;
assert(f);
@@ -2781,12 +2781,7 @@ static int generic_array_get(
/* If there's corruption and we're going upwards, move back to the previous entry
* array and start iterating entries from there. */
r = bump_entry_array(f, NULL, a, first, DIRECTION_UP, &a);
if (r <= 0)
return r;
i = UINT64_MAX;
break;
}
if (r < 0)
@@ -2808,6 +2803,10 @@ static int generic_array_get(
/* In the first iteration of the while loop, we reuse i, k and o from the previous while
* loop. */
if (i == UINT64_MAX) {
r = bump_entry_array(f, o, a, first, direction, &a);
if (r <= 0)
return r;
r = journal_file_move_to_object(f, OBJECT_ENTRY_ARRAY, a, &o);
if (r < 0)
return r;
@@ -2843,10 +2842,6 @@ static int generic_array_get(
} while (bump_array_index(&i, direction, k) > 0);
r = bump_entry_array(f, o, a, first, direction, &a);
if (r <= 0)
return r;
t += k;
i = UINT64_MAX;
}