[systemd-devel] [PATCH] journal: add HAVE_XZ check to avoid build failure

Yin Kangkai kangkai.yin at intel.com
Fri Aug 24 01:52:58 PDT 2012


Without this, build fail if we --disable-xz or does not have xz installed in
system.

Signed-off-by: Yin Kangkai <kangkai.yin at intel.com>
---
 src/journal/journal-verify.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 2401293..5d134bd 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
                 h1 = le64toh(o->data.hash);
 
                 if (o->object.flags & OBJECT_COMPRESSED) {
+#ifdef HAVE_XZ
                         void *b = NULL;
                         uint64_t alloc = 0, b_size;
 
@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
 
                         h2 = hash64(b, b_size);
                         free(b);
+#else
+                        return -EPROTONOSUPPORT;
+#endif
                 } else
                         h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
 
-- 
1.7.3.4



More information about the systemd-devel mailing list