picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal: split out array index inc/dec code into a new call bump_array_index()

Browse source 
This allows us to share a bit more code between journal_file_next_entry() and
journal_file_next_entry_for_data().
This commit is contained in:
Lennart Poettering 2016-10-12 11:54:36 +02:00
parent 202fd896e5
commit aa598ba5b6
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/journal/journal-file.c
View file

@ -2484,6 +2484,25 @@ int journal_file_compare_locations(JournalFile *af, JournalFile *bf) {
return 0;
}
static int bump_array_index(uint64_t *i, direction_t direction, uint64_t n) {
/* Increase or decrease the specified index, in the right direction. */
if (direction == DIRECTION_DOWN) {
if (*i >= n - 1)
return 0;
(*i) ++;
} else {
if (*i <= 0)
return 0;
(*i) --;
}
return 1;
}
int journal_file_next_entry(
JournalFile *f,
uint64_t p,
@ -2514,17 +2533,9 @@ int journal_file_next_entry(
if (r <= 0)
return r;
if (direction == DIRECTION_DOWN) {
if (i >= n - 1)
return 0;
i++;
} else {
if (i <= 0)
return 0;
i--;
}
r = bump_array_index(&i, direction, n);
if (r <= 0)
return r;
}
/* And jump to it */
@ -2594,18 +2605,9 @@ int journal_file_next_entry_for_data(
if (r <= 0)
return r;
if (direction == DIRECTION_DOWN) {
if (i >= n - 1)
return 0;
i++;
} else {
if (i <= 0)
return 0;
i--;
}
r = bump_array_index(&i, direction, n);
if (r <= 0)
return r;
}
return generic_array_get_plus_one(f,