]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: irrelevant coding style fixes 1663/head
authorLennart Poettering <lennart@poettering.net>
Sat, 24 Oct 2015 13:08:15 +0000 (15:08 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 24 Oct 2015 13:08:15 +0000 (15:08 +0200)
src/journal/compress.c
src/journal/journal-file.c

index 8c92e26edd73aef09ad95f90766f3e68cf51b174..fb40bed594d1a0bc5550a1d997589c1e1c243563 100644 (file)
@@ -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;
index 89068f26d23cc9ac8f528b0a8b44ec4b8ac8dc5e..fadc0e428650809243f45aa1ab69baee13bf237b 100644 (file)
@@ -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;