From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 24 Oct 2015 13:08:15 +0000 (+0200)
Subject: journal: irrelevant coding style fixes
X-Git-Tag: v228~155^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1663%2Fhead;p=thirdparty%2Fsystemd.git

journal: irrelevant coding style fixes
---

diff --git a/src/journal/compress.c b/src/journal/compress.c
index 8c92e26edd7..fb40bed594d 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -57,10 +57,11 @@ int compress_blob_xz(const void *src, uint64_t src_size, void *dst, size_t *dst_
 #ifdef HAVE_XZ
         static const lzma_options_lzma opt = {
                 1u << 20u, NULL, 0, LZMA_LC_DEFAULT, LZMA_LP_DEFAULT,
-                LZMA_PB_DEFAULT, LZMA_MODE_FAST, 128, LZMA_MF_HC3, 4};
-        static const lzma_filter filters[2] = {
-                {LZMA_FILTER_LZMA2, (lzma_options_lzma*) &opt},
-                {LZMA_VLI_UNKNOWN, NULL}
+                LZMA_PB_DEFAULT, LZMA_MODE_FAST, 128, LZMA_MF_HC3, 4
+        };
+        static const lzma_filter filters[] = {
+                { LZMA_FILTER_LZMA2, (lzma_options_lzma*) &opt },
+                { LZMA_VLI_UNKNOWN, NULL }
         };
         lzma_ret ret;
         size_t out_pos = 0;
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 89068f26d23..fadc0e42865 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1057,7 +1057,7 @@ static int journal_file_append_data(
         r = journal_file_find_data_object_with_hash(f, data, size, hash, &o, &p);
         if (r < 0)
                 return r;
-        else if (r > 0) {
+        if (r > 0) {
 
                 if (ret)
                         *ret = o;