clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-05 13:11:32 +00: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 
(cherry picked from commit 581483bf59)
This commit is contained in:
Lennart Poettering
2014-03-05 00:26:49 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent 840ad04cd8
commit e19b6a48bf
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/sd-journal.c
+10 -8
View File
@@ -2359,6 +2359,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;
if (!j)
@@ -2382,19 +2383,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;
}