chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
474abe3
)
journal: fix interleaving of files with different time sources
author
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Jul 2012 15:35:04 +0000
(17:35 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Jul 2012 22:32:32 +0000
(
00:32
+0200)
src/journal/sd-journal.c
patch
|
blob
|
history
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 5420be13ea0a6acbe95ac20f668f8550713caa7f..b6e74a0d4cc43e9edf81032fdd802a362af70b81 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-240,7
+240,7
@@
static int compare_order(JournalFile *af, Object *ao,
/* Otherwise compare UTC time */
a = le64toh(ao->entry.realtime);
- b = le64toh(
a
o->entry.realtime);
+ b = le64toh(
b
o->entry.realtime);
if (a < b)
return -1;
@@
-249,7
+249,7
@@
static int compare_order(JournalFile *af, Object *ao,
/* Finally, compare by contents */
a = le64toh(ao->entry.xor_hash);
- b = le64toh(
a
o->entry.xor_hash);
+ b = le64toh(
b
o->entry.xor_hash);
if (a < b)
return -1;