chiark / gitweb /
journal: fix interleaving of files with different time sources
authorLennart Poettering <lennart@poettering.net>
Thu, 12 Jul 2012 15:35:04 +0000 (17:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 12 Jul 2012 22:32:32 +0000 (00:32 +0200)
src/journal/sd-journal.c

index 5420be1..b6e74a0 100644 (file)
@@ -240,7 +240,7 @@ static int compare_order(JournalFile *af, Object *ao,
 
         /* Otherwise compare UTC time */
         a = le64toh(ao->entry.realtime);
-        b = le64toh(ao->entry.realtime);
+        b = le64toh(bo->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(ao->entry.xor_hash);
+        b = le64toh(bo->entry.xor_hash);
 
         if (a < b)
                 return -1;