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: change direction tests to use the same convention (cp </> np)

Browse Source 
The order was different in various places, which makes it harder to
read to code. Also consistently use ternany for all direction checks.

Remove one free(NULL).
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-06-06 23:30:46 -04:00
parent 87011c25d9
commit bc3029268c
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/journal/sd-journal.c
View File

@ -163,7 +163,7 @@ static bool same_field(const void *_a, size_t s, const void *_b, size_t t) {
return true; return true;
} }
return true; assert_not_reached("\"=\" not found");
} }
static Match *match_new(Match *p, MatchType t) { static Match *match_new(Match *p, MatchType t) {
@ -371,10 +371,8 @@ static char *match_make_string(Match *m) {
p = k; p = k;
enclose = true; enclose = true;
} else { } else
free(p);
p = t; p = t;
}
} }
if (enclose) { if (enclose) {
@ -587,11 +585,14 @@ static int next_for_match(
if (r < 0) if (r < 0)
return r; return r;
else if (r > 0) { else if (r > 0) {
if (np == 0 || (direction == DIRECTION_DOWN ? np > cp : np < cp)) if (np == 0 || (direction == DIRECTION_DOWN ? cp < np : cp > np))
np = cp; np = cp;
} }
} }
if (np == 0)
return 0;
} else if (m->type == MATCH_AND_TERM) { } else if (m->type == MATCH_AND_TERM) {
Match *i, *last_moved; Match *i, *last_moved;
@ -624,8 +625,7 @@ static int next_for_match(
} }
} }
if (np == 0) assert(np > 0);
return 0;
r = journal_file_move_to_object(f, OBJECT_ENTRY, np, &n); r = journal_file_move_to_object(f, OBJECT_ENTRY, np, &n);
if (r < 0) if (r < 0)
@ -730,7 +730,7 @@ static int find_location_for_match(
if (r <= 0) if (r <= 0)
return r; return r;
if (np == 0 || (direction == DIRECTION_DOWN ? np < cp : np > cp)) if (np == 0 || (direction == DIRECTION_DOWN ? cp > np : cp < np))
np = cp; np = cp;
} }
@ -826,7 +826,7 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
return r; return r;
} }
/* OK, we found the spot, now let's advance until to an entry /* OK, we found the spot, now let's advance until an entry
* that is actually different from what we were previously * that is actually different from what we were previously
* looking at. This is necessary to handle entries which exist * looking at. This is necessary to handle entries which exist
* in two (or more) journal files, and which shall all be * in two (or more) journal files, and which shall all be
@ -888,10 +888,7 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
k = compare_entry_order(f, o, new_file, new_offset); k = compare_entry_order(f, o, new_file, new_offset);
if (direction == DIRECTION_DOWN) found = direction == DIRECTION_DOWN ? k < 0 : k > 0;
found = k < 0;
else
found = k > 0;
} }
if (found) { if (found) {