morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

journal: don't clobber return parameters of sd_journal_get_cutoff_realtime_usec() on failure

Browse Source
This commit is contained in:
Lennart Poettering
2014-02-19 17:49:50 +01:00
parent 1756a0118e
commit 581483bf59
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}