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

journal: simplify set_location()

Browse source 
set_location() is called from real_journal_next() when a winning entry
has been picked from among the candidates in journal files.

The location type is always set to LOCATION_DISCRETE. No need to pass
it as a parameter.
The per-JournalFile location information is already updated at this
point. No need for having the direction and offset here.
This commit is contained in:
Michal Schmidt 2014-12-16 22:38:09 +01:00
parent 6573ef05a3
commit 1eb6332d55
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/journal/sd-journal.c
View file

@ -114,21 +114,16 @@ static void init_location(Location *l, LocationType type, JournalFile *f, Object
l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true;
}
static void set_location(sd_journal *j, LocationType type, JournalFile *f, Object *o,
direction_t direction, uint64_t offset) {
static void set_location(sd_journal *j, JournalFile *f, Object *o) {
assert(j);
assert(type == LOCATION_DISCRETE || type == LOCATION_SEEK);
assert(f);
assert(o);
init_location(&j->current_location, type, f, o);
init_location(&j->current_location, LOCATION_DISCRETE, f, o);
j->current_file = f;
j->current_field = 0;
f->last_direction = direction;
f->current_offset = offset;
/* Let f know its candidate entry was picked. */
assert(f->location_type == LOCATION_SEEK);
f->location_type = LOCATION_DISCRETE;
@ -921,7 +916,7 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
if (r < 0)
return r;
set_location(j, LOCATION_DISCRETE, new_file, o, direction, new_offset);
set_location(j, new_file, o);
return 1;
}