SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compress: replace compress_blob() with compress_blob_explicit()

Browse Source 
And make compress_xyz() return 0 on success, as we know which compression
algorithm is used when calling compress_blob().

Follow-up for 2360352ef0.
This commit is contained in:
Yu Watanabe
2023-04-11 09:14:34 +02:00
committed by Daan De Meyer
parent 7cb9ed5d38
commit bfeaa62dbc
6 changed files with 39 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/journal-file.c
+16 -16
View File
@@ -1671,7 +1671,7 @@ static int journal_file_append_field(
return 0;
}
static Compression maybe_compress_payload(JournalFile *f, uint8_t *dst, const uint8_t *src, uint64_t size, size_t *rsize) {
static int maybe_compress_payload(JournalFile *f, uint8_t *dst, const uint8_t *src, uint64_t size, size_t *rsize) {
assert(f);
assert(f->header);
@@ -1681,21 +1681,17 @@ static Compression maybe_compress_payload(JournalFile *f, uint8_t *dst, const ui
c = JOURNAL_FILE_COMPRESSION(f);
if (c == COMPRESSION_NONE || size < f->compress_threshold_bytes)
return COMPRESSION_NONE;
return 0;
r = compress_blob_explicit(c, src, size, dst, size - 1, rsize);
if (r < 0) {
log_debug_errno(r, "Failed to compress data object using %s, ignoring: %m", compression_to_string(c));
/* Compression didn't work, we don't really care why, let's continue without compression */
return COMPRESSION_NONE;
}
r = compress_blob(c, src, size, dst, size - 1, rsize);
if (r < 0)
return log_debug_errno(r, "Failed to compress data object using %s, ignoring: %m", compression_to_string(c));
assert(r == c);
log_debug("Compressed data object %"PRIu64" -> %zu using %s", size, *rsize, compression_to_string(c));
return c;
return 1; /* compressed */
#else
return COMPRESSION_NONE;
return 0;
#endif
}
@@ -1709,7 +1705,6 @@ static int journal_file_append_data(
uint64_t hash, p, osize;
Object *o, *fo;
size_t rsize = 0;
Compression c;
const void *eq;
int r;
@@ -1737,13 +1732,18 @@ static int journal_file_append_data(
o->data.hash = htole64(hash);
c = maybe_compress_payload(f, journal_file_data_payload_field(f, o), data, size, &rsize);
r = maybe_compress_payload(f, journal_file_data_payload_field(f, o), data, size, &rsize);
if (r <= 0)
/* We don't really care failures, let's continue without compression */
memcpy_safe(journal_file_data_payload_field(f, o), data, size);
else {
Compression c = JOURNAL_FILE_COMPRESSION(f);
assert(c >= 0 && c < _COMPRESSION_MAX && c != COMPRESSION_NONE);
if (c != COMPRESSION_NONE) {
o->object.size = htole64(journal_file_data_payload_offset(f) + rsize);
o->object.flags |= COMPRESSION_TO_OBJECT_FLAG(c);
} else
memcpy_safe(journal_file_data_payload_field(f, o), data, size);
}
r = journal_file_link_data(f, o, p, hash);
if (r < 0)