From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Jan 2012 21:44:43 +0000 (+0100)
Subject: journal: fix more 32/64 bit issues
X-Git-Tag: v39~73
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b785c858c3baf855ec42e3b83f5d23dadfece069

journal: fix more 32/64 bit issues
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 6ba3d8dca..419e15e46 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -640,8 +640,7 @@ int journal_file_find_data_object_with_hash(
 
                 if (o->object.flags & OBJECT_COMPRESSED) {
 #ifdef HAVE_XZ
-                        uint64_t l;
-                        size_t rsize;
+                        uint64_t l, rsize;
 
                         l = le64toh(o->object.size);
                         if (l <= offsetof(Object, data.payload))
@@ -652,7 +651,7 @@ int journal_file_find_data_object_with_hash(
                         if (!uncompress_blob(o->data.payload, l, &f->compress_buffer, &f->compress_buffer_size, &rsize))
                                 return -EBADMSG;
 
-                        if ((uint64_t) rsize == size &&
+                        if (rsize == size &&
                             memcmp(f->compress_buffer, data, size) == 0) {
 
                                 if (ret)
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 0be393292..4ef4a1447 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -77,7 +77,7 @@ typedef struct JournalFile {
 
 #ifdef HAVE_XZ
         void *compress_buffer;
-        size_t compress_buffer_size;
+        uint64_t compress_buffer_size;
 #endif
 } JournalFile;