mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 11:55:44 +03:00
journal: don't clobber return parameters of sd_journal_get_cutoff_realtime_usec() on failure
This commit is contained in:
parent
1756a0118e
commit
581483bf59
@ -2347,6 +2347,7 @@ _public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
|
||||
Iterator i;
|
||||
JournalFile *f;
|
||||
bool first = true;
|
||||
uint64_t fmin = 0, tmax = 0;
|
||||
int r;
|
||||
|
||||
assert_return(j, -EINVAL);
|
||||
@ -2366,19 +2367,20 @@ _public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
|
||||
continue;
|
||||
|
||||
if (first) {
|
||||
if (from)
|
||||
*from = fr;
|
||||
if (to)
|
||||
*to = t;
|
||||
fmin = fr;
|
||||
tmax = t;
|
||||
first = false;
|
||||
} else {
|
||||
if (from)
|
||||
*from = MIN(fr, *from);
|
||||
if (to)
|
||||
*to = MAX(t, *to);
|
||||
fmin = MIN(fr, fmin);
|
||||
tmax = MAX(t, tmax);
|
||||
}
|
||||
}
|
||||
|
||||
if (from)
|
||||
*from = fmin;
|
||||
if (to)
|
||||
*to = tmax;
|
||||
|
||||
return first ? 0 : 1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user