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/basic/compress.c
+6 -6
View File
@@ -107,7 +107,7 @@ int compress_blob_xz(const void *src, uint64_t src_size,
return -ENOBUFS;
*dst_size = out_pos;
return COMPRESSION_XZ;
return 0;
#else
return -EPROTONOSUPPORT;
#endif
@@ -137,7 +137,7 @@ int compress_blob_lz4(const void *src, uint64_t src_size,
unaligned_write_le64(dst, src_size);
*dst_size = r + 8;
return COMPRESSION_LZ4;
return 0;
#else
return -EPROTONOSUPPORT;
#endif
@@ -160,7 +160,7 @@ int compress_blob_zstd(
return zstd_ret_to_errno(k);
*dst_size = k;
return COMPRESSION_ZSTD;
return 0;
#else
return -EPROTONOSUPPORT;
#endif
@@ -626,7 +626,7 @@ int compress_stream_xz(int fdf, int fdt, uint64_t max_bytes, uint64_t *ret_uncom
s.total_in, s.total_out,
(double) s.total_out / s.total_in * 100);
return COMPRESSION_XZ;
return 0;
}
}
}
@@ -717,7 +717,7 @@ int compress_stream_lz4(int fdf, int fdt, uint64_t max_bytes, uint64_t *ret_unco
total_in, total_out,
(double) total_out / total_in * 100);
return COMPRESSION_LZ4;
return 0;
#else
return -EPROTONOSUPPORT;
#endif
@@ -961,7 +961,7 @@ int compress_stream_zstd(int fdf, int fdt, uint64_t max_bytes, uint64_t *ret_unc
log_debug("ZSTD compression finished (%" PRIu64 " -> %" PRIu64 " bytes)",
in_bytes, max_bytes - left);
return COMPRESSION_ZSTD;
return 0;
#else
return -EPROTONOSUPPORT;
#endif
src/basic/compress.h
+1 -7
View File
@@ -63,7 +63,7 @@ int decompress_stream_xz(int fdf, int fdt, uint64_t max_size);
int decompress_stream_lz4(int fdf, int fdt, uint64_t max_size);
int decompress_stream_zstd(int fdf, int fdt, uint64_t max_size);
static inline int compress_blob_explicit(
static inline int compress_blob(
Compression compression,
const void *src, uint64_t src_size,
void *dst, size_t dst_alloc_size, size_t *dst_size) {
@@ -80,12 +80,6 @@ static inline int compress_blob_explicit(
}
}
#define compress_blob(src, src_size, dst, dst_alloc_size, dst_size) \
compress_blob_explicit( \
DEFAULT_COMPRESSION, \
src, src_size, \
dst, dst_alloc_size, dst_size)
static inline int compress_stream(int fdf, int fdt, uint64_t max_bytes, uint64_t *ret_uncompressed_size) {
switch (DEFAULT_COMPRESSION) {
case COMPRESSION_ZSTD: