RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:07:47 +00:00
Code Issues Activity Actions

LibCompress: Rename Compress::Zlib to Compress::ZlibDecompressor

Browse source 
Because that's what it is, even if it mainly relies on
`DeflateDecompressor` to do the heavy lifting.
This commit is contained in:
Tim Schumacher 2022-12-26 15:51:51 +01:00 • committed by Sam Atkins
parent edd004fe90
commit 23a9d62f39
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibCompress/Zlib.cpp
View file

@ -15,7 +15,7 @@ namespace Compress {
constexpr static size_t Adler32Size = sizeof(u32);
Optional<Zlib> Zlib::try_create(ReadonlyBytes data)
Optional<ZlibDecompressor> ZlibDecompressor::try_create(ReadonlyBytes data)
{
if (data.size() < (sizeof(ZlibHeader) + Adler32Size))
return {};
@ -31,18 +31,18 @@ Optional<Zlib> Zlib::try_create(ReadonlyBytes data)
if (header.as_u16 % 31 != 0)
return {}; // error correction code doesn't match
Zlib zlib { header, data };
ZlibDecompressor zlib { header, data };
zlib.m_data_bytes = data.slice(2, data.size() - sizeof(ZlibHeader) - Adler32Size);
return zlib;
}
Zlib::Zlib(ZlibHeader header, ReadonlyBytes data)
ZlibDecompressor::ZlibDecompressor(ZlibHeader header, ReadonlyBytes data)
: m_header(header)
, m_input_data(data)
{
}
Optional<ByteBuffer> Zlib::decompress()
Optional<ByteBuffer> ZlibDecompressor::decompress()
{
auto buffer_or_error = DeflateDecompressor::decompress_all(m_data_bytes);
if (buffer_or_error.is_error())
@ -50,7 +50,7 @@ Optional<ByteBuffer> Zlib::decompress()
return buffer_or_error.release_value();
}
Optional<ByteBuffer> Zlib::decompress_all(ReadonlyBytes bytes)
Optional<ByteBuffer> ZlibDecompressor::decompress_all(ReadonlyBytes bytes)
{
auto zlib = try_create(bytes);
if (!zlib.has_value())
@ -58,7 +58,7 @@ Optional<ByteBuffer> Zlib::decompress_all(ReadonlyBytes bytes)
return zlib->decompress();
}
u32 Zlib::checksum()
u32 ZlibDecompressor::checksum()
{
if (!m_checksum) {
auto bytes = m_input_data.slice_from_end(Adler32Size);