chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: properly determine cutoff max date
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 772a4fb6dc825d3ecd2d631671a8b2fe710af4ae..d5d2d78f1c30470389799028c3f7d4f8f62b79b8 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-2121,7
+2121,7
@@
_public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
if (from)
*from = MIN(fr, *from);
if (to)
if (from)
*from = MIN(fr, *from);
if (to)
- *to = M
IN
(t, *to);
+ *to = M
AX
(t, *to);
}
}
}
}
@@
-2160,7
+2160,7
@@
_public_ int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, sd_id128_t boot
if (from)
*from = MIN(fr, *from);
if (to)
if (from)
*from = MIN(fr, *from);
if (to)
- *to = M
IN
(t, *to);
+ *to = M
AX
(t, *to);
}
}
}
}
@@
-2259,7
+2259,7
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
size_t ol;
bool found;
size_t ol;
bool found;
- /* Proceed to next data object in
list
the field's linked list */
+ /* Proceed to next data object in the field's linked list */
if (j->unique_offset == 0) {
r = journal_file_find_field_object(j->unique_file, j->unique_field, k, &o, NULL);
if (r < 0)
if (j->unique_offset == 0) {
r = journal_file_find_field_object(j->unique_file, j->unique_field, k, &o, NULL);
if (r < 0)