summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-01-11 22:44:43 +0100
committerLennart Poettering <lennart@poettering.net>2012-01-11 22:44:43 +0100
commitb785c858c3baf855ec42e3b83f5d23dadfece069 (patch)
tree028ce49fd67be77a7017ba4e634f01edaea9dced /src
parentfdcad0c25579a60061b1fda956686e878a80faef (diff)
journal: fix more 32/64 bit issues
Diffstat (limited to 'src')
-rw-r--r--src/journal/journal-file.c5
-rw-r--r--src/journal/journal-file.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 6ba3d8dca3..419e15e46f 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 0be3932921..4ef4a14479 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;