journal: Add missing byte order conversions

[elogind.git] / src / journal / journal-verify.c

diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 781b1ee1deb08d8f269a1325ded712675b4de8ce..82b0f0a98bb23a7ffa0bdc657819eabc78f09eb5 100644 (file)
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -67,7 +67,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
                 }
 
                 if (le64toh(o->object.size) - offsetof(DataObject, payload) <= 0) {
-                        log_error(OFSfmt": bad object size (<= %"PRIu64"): %"PRIu64,
+                        log_error(OFSfmt": bad object size (<= %zu): %"PRIu64,
                                   offset,
                                   offsetof(DataObject, payload),
                                   le64toh(o->object.size));
@@ -120,7 +120,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
 
         case OBJECT_FIELD:
                 if (le64toh(o->object.size) - offsetof(FieldObject, payload) <= 0) {
-                        log_error(OFSfmt": bad field size (<= %"PRIu64"): %"PRIu64,
+                        log_error(OFSfmt": bad field size (<= %zu): %"PRIu64,
                                   offset,
                                   offsetof(FieldObject, payload),
                                   le64toh(o->object.size));
@@ -139,7 +139,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
 
         case OBJECT_ENTRY:
                 if ((le64toh(o->object.size) - offsetof(EntryObject, items)) % sizeof(EntryItem) != 0) {
-                        log_error(OFSfmt": bad entry size (<= %"PRIu64"): %"PRIu64,
+                        log_error(OFSfmt": bad entry size (<= %zu): %"PRIu64,
                                   offset,
                                   offsetof(EntryObject, items),
                                   le64toh(o->object.size));
@@ -249,12 +249,12 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
                 }
 
                 for (i = 0; i < journal_file_entry_array_n_items(o); i++)
-                        if (o->entry_array.items[i] != 0 &&
-                            !VALID64(o->entry_array.items[i])) {
+                        if (le64toh(o->entry_array.items[i]) != 0 &&
+                            !VALID64(le64toh(o->entry_array.items[i]))) {
                                 log_error(OFSfmt": invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt,
                                           offset,
                                           i, journal_file_entry_array_n_items(o),
-                                          o->entry_array.items[i]);
+                                          le64toh(o->entry_array.items[i]));
                                 return -EBADMSG;
                         }