From 35548cab75ce817107728873f55b74b754e2ad7b Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 1 Jan 2023 00:55:23 +0100 Subject: [PATCH] LibCompress: Remove `DuplexMemoryStream` from `GzipDecompressor` --- Userland/Libraries/LibCompress/Gzip.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibCompress/Gzip.cpp b/Userland/Libraries/LibCompress/Gzip.cpp index 32f1cd17f2..502117bf23 100644 --- a/Userland/Libraries/LibCompress/Gzip.cpp +++ b/Userland/Libraries/LibCompress/Gzip.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include @@ -167,15 +166,17 @@ ErrorOr GzipDecompressor::decompress_all(ReadonlyBytes bytes) { auto memory_stream = TRY(Core::Stream::FixedMemoryStream::construct(bytes)); auto gzip_stream = make(move(memory_stream)); - DuplexMemoryStream output_stream; + Core::Stream::AllocatingMemoryStream output_stream; auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); while (!gzip_stream->is_eof()) { auto const data = TRY(gzip_stream->read(buffer)); - output_stream.write_or_error(data); + TRY(output_stream.write_entire_buffer(data)); } - 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; } bool GzipDecompressor::is_eof() const { return m_input_stream->is_eof(); }