From 0d69fbd19f8cd3eb16d41d7c18a0abecea92e9a7 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 1 Jan 2023 00:50:18 +0100 Subject: [PATCH] LibCompress: Remove `DuplexMemoryStream` from `DeflateDecompressor` --- Userland/Libraries/LibCompress/Deflate.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibCompress/Deflate.cpp b/Userland/Libraries/LibCompress/Deflate.cpp index 2a87bcbdfa..c2a3370f35 100644 --- a/Userland/Libraries/LibCompress/Deflate.cpp +++ b/Userland/Libraries/LibCompress/Deflate.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include @@ -317,15 +316,17 @@ ErrorOr DeflateDecompressor::decompress_all(ReadonlyBytes bytes) { auto memory_stream = TRY(Core::Stream::FixedMemoryStream::construct(bytes)); auto deflate_stream = TRY(DeflateDecompressor::construct(move(memory_stream))); - DuplexMemoryStream output_stream; + Core::Stream::AllocatingMemoryStream output_stream; auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); while (!deflate_stream->is_eof()) { auto const slice = TRY(deflate_stream->read(buffer)); - output_stream.write_or_error(slice); + TRY(output_stream.write_entire_buffer(slice)); } - return output_stream.copy_into_contiguous_buffer(); + auto output_buffer = TRY(ByteBuffer::create_uninitialized(output_stream.used_buffer_size())); + TRY(output_stream.read_entire_buffer(output_buffer)); + return output_buffer; } ErrorOr DeflateDecompressor::decode_length(u32 symbol)