summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-24 15:08:15 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-24 15:08:15 +0200
commit0240c603691e006165d8687d6a2c70859755b11f (patch)
tree0097badefcc01be869028e67ae72c9e197fcb649 /src/journal
parentd1afbcd22170e95c79261340071d376fe41fc3af (diff)
journal: irrelevant coding style fixes
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/compress.c9
-rw-r--r--src/journal/journal-file.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/journal/compress.c b/src/journal/compress.c
index 8c92e26edd..fb40bed594 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 89068f26d2..fadc0e4286 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;