RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 22:48:11 +00:00
Code Issues Activity Actions

LibCompress: Return Optional from decompress_all method.

Browse source
This commit is contained in:
asynts 2020-09-08 16:49:05 +02:00 • committed by Andreas Kling
parent 7e02cad476
commit 4af8eea56f
7 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibCompress/Deflate.cpp
View file

@ -303,7 +303,7 @@ bool DeflateDecompressor::discard_or_error(size_t count)
bool DeflateDecompressor::eof() const { return m_state == State::Idle && m_read_final_bock; }
ByteBuffer DeflateDecompressor::decompress_all(ReadonlyBytes bytes)
Optional<ByteBuffer> DeflateDecompressor::decompress_all(ReadonlyBytes bytes)
{
InputMemoryStream memory_stream { bytes };
InputBitStream bit_stream { memory_stream };

2
Libraries/LibCompress/Deflate.h
View file

@ -94,7 +94,7 @@ public:
bool discard_or_error(size_t) override;
bool eof() const override;
static ByteBuffer decompress_all(ReadonlyBytes);
static Optional<ByteBuffer> decompress_all(ReadonlyBytes);
private:
u32 decode_run_length(u32);

2
Libraries/LibCompress/Gzip.cpp
View file

@ -158,7 +158,7 @@ bool GzipDecompressor::discard_or_error(size_t count)
return true;
}
ByteBuffer GzipDecompressor::decompress_all(ReadonlyBytes bytes)
Optional<ByteBuffer> GzipDecompressor::decompress_all(ReadonlyBytes bytes)
{
InputMemoryStream memory_stream { bytes };
GzipDecompressor gzip_stream { memory_stream };

2
Libraries/LibCompress/Gzip.h
View file

@ -41,7 +41,7 @@ public:
bool discard_or_error(size_t) override;
bool eof() const override;
static ByteBuffer decompress_all(ReadonlyBytes);
static Optional<ByteBuffer> decompress_all(ReadonlyBytes);
private:
struct [[gnu::packed]] BlockHeader

8
Libraries/LibCompress/Zlib.cpp
View file

@ -55,11 +55,17 @@ Zlib::Zlib(ReadonlyBytes data)
m_data_bytes = data.slice(2, data.size() - 2 - 4);
}
ByteBuffer Zlib::decompress()
Optional<ByteBuffer> Zlib::decompress()
{
return DeflateDecompressor::decompress_all(m_data_bytes);
}
Optional<ByteBuffer> Zlib::decompress_all(ReadonlyBytes bytes)
{
Zlib zlib { bytes };
return zlib.decompress();
}
u32 Zlib::checksum()
{
if (!m_checksum) {

8
Libraries/LibCompress/Zlib.h
View file

@ -36,14 +36,10 @@ class Zlib {
public:
Zlib(ReadonlyBytes data);
ByteBuffer decompress();
Optional<ByteBuffer> decompress();
u32 checksum();
static ByteBuffer decompress_all(ReadonlyBytes bytes)
{
Zlib zlib { bytes };
return zlib.decompress();
}
static Optional<ByteBuffer> decompress_all(ReadonlyBytes);
private:
u8 m_compression_method;

18
Userland/test-compress.cpp
View file

@ -55,7 +55,7 @@ TEST_CASE(deflate_decompress_compressed_block)
const u8 uncompressed[] = "This is a simple text file :)";
const auto decompressed = Compress::DeflateDecompressor::decompress_all(compressed);
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.bytes()));
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.value().bytes()));
}
TEST_CASE(deflate_decompress_uncompressed_block)
@ -68,7 +68,7 @@ TEST_CASE(deflate_decompress_uncompressed_block)
const u8 uncompressed[] = "Hello, World!";
const auto decompressed = Compress::DeflateDecompressor::decompress_all(compressed);
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.bytes()));
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.value().bytes()));
}
TEST_CASE(deflate_decompress_multiple_blocks)
@ -85,7 +85,7 @@ TEST_CASE(deflate_decompress_multiple_blocks)
const u8 uncompressed[] = "The first block is uncompressed and the second block is compressed.";
const auto decompressed = Compress::DeflateDecompressor::decompress_all(compressed);
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.bytes()));
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.value().bytes()));
}
TEST_CASE(deflate_decompress_zeroes)
@ -98,7 +98,7 @@ TEST_CASE(deflate_decompress_zeroes)
const Array<u8, 4096> uncompressed { 0 };
const auto decompressed = Compress::DeflateDecompressor::decompress_all(compressed);
EXPECT(compare(uncompressed, decompressed.bytes()));
EXPECT(compare(uncompressed, decompressed.value().bytes()));
}
TEST_CASE(zlib_decompress_simple)
@ -113,7 +113,7 @@ TEST_CASE(zlib_decompress_simple)
const u8 uncompressed[] = "This is a simple text file :)";
const auto decompressed = Compress::Zlib::decompress_all(compressed);
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.bytes()));
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.value().bytes()));
}
TEST_CASE(gzip_decompress_simple)
@ -127,7 +127,7 @@ TEST_CASE(gzip_decompress_simple)
const u8 uncompressed[] = "word1 abc word2";
const auto decompressed = Compress::GzipDecompressor::decompress_all(compressed);
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.bytes()));
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.value().bytes()));
}
TEST_CASE(gzip_decompress_multiple_members)
@ -143,7 +143,7 @@ TEST_CASE(gzip_decompress_multiple_members)
const u8 uncompressed[] = "abcabcabcabc";
const auto decompressed = Compress::GzipDecompressor::decompress_all(compressed);
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.bytes()));
EXPECT(compare({ uncompressed, sizeof(uncompressed) - 1 }, decompressed.value().bytes()));
}
TEST_CASE(gzip_decompress_zeroes)
@ -168,7 +168,7 @@ TEST_CASE(gzip_decompress_zeroes)
const Array<u8, 128 * 1024> uncompressed = { 0 };
const auto decompressed = Compress::GzipDecompressor::decompress_all(compressed);
EXPECT(compare(uncompressed, decompressed.bytes()));
EXPECT(compare(uncompressed, decompressed.value().bytes()));
}
TEST_CASE(gzip_decompress_repeat_around_buffer)
@ -188,7 +188,7 @@ TEST_CASE(gzip_decompress_repeat_around_buffer)
uncompressed.span().slice(0x7f00, 0x0100).fill(1);
const auto decompressed = Compress::GzipDecompressor::decompress_all(compressed);
EXPECT(compare(uncompressed, decompressed.bytes()));
EXPECT(compare(uncompressed, decompressed.value().bytes()));
}
TEST_MAIN(Compress)