X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-compress.c;h=f5f5f8df39022008a0129f204f7e4d10390a3a8d;hb=54cba0b16cdc94d5c21e8d805a4ade1255d43bc9;hp=6ac8373c61ff9ba951145d550c598f8938855513;hpb=d89c8fdf48c7bad5816b9f2e77e8361721f22517;p=elogind.git diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c index 6ac8373c6..f5f5f8df3 100644 --- a/src/journal/test-compress.c +++ b/src/journal/test-compress.c @@ -27,21 +27,20 @@ # define XZ_OK -EPROTONOSUPPORT #endif -#ifdef HAVE_XZ +#ifdef HAVE_LZ4 # define LZ4_OK 0 #else # define LZ4_OK -EPROTONOSUPPORT #endif typedef int (compress_blob_t)(const void *src, uint64_t src_size, - void *dst, uint64_t *dst_size); + void *dst, size_t *dst_size); typedef int (decompress_blob_t)(const void *src, uint64_t src_size, - void **dst, uint64_t *dst_alloc_size, - uint64_t* dst_size, uint64_t dst_max); - + void **dst, size_t *dst_alloc_size, + size_t* dst_size, size_t dst_max); typedef int (decompress_sw_t)(const void *src, uint64_t src_size, - void **buffer, uint64_t *buffer_size, - const void *prefix, uint64_t prefix_len, + void **buffer, size_t *buffer_size, + const void *prefix, size_t prefix_len, uint8_t extra); typedef int (compress_stream_t)(int fdf, int fdt, off_t max_bytes); @@ -53,8 +52,8 @@ static void test_compress_decompress(int compression, char text[] = "foofoofoofoo AAAA aaaaaaaaa ghost busters barbarbar FFF" "foofoofoofoo AAAA aaaaaaaaa ghost busters barbarbar FFF"; char compressed[512]; - uint64_t csize = 512; - uint64_t usize = 0; + size_t csize = 512; + size_t usize = 0; _cleanup_free_ char *decompressed = NULL; int r; @@ -92,8 +91,8 @@ static void test_decompress_startswith(int compression, char text[] = "foofoofoofoo AAAA aaaaaaaaa ghost busters barbarbar FFF" "foofoofoofoo AAAA aaaaaaaaa ghost busters barbarbar FFF"; char compressed[512]; - uint64_t csize = 512; - uint64_t usize = 0; + size_t csize = 512; + size_t usize = 0; _cleanup_free_ char *decompressed = NULL; log_info("/* testing decompress_startswith with %s */",