From e11e7309dd396864f93657bda2b536138b866952 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 12 Apr 2023 12:01:22 +0200 Subject: [PATCH] LibCompress: Replace usages of the Endian bytes accessor --- Userland/Libraries/LibCompress/Deflate.cpp | 6 ++---- Userland/Libraries/LibCompress/Gzip.cpp | 6 ++---- Userland/Libraries/LibCompress/Zlib.cpp | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Userland/Libraries/LibCompress/Deflate.cpp b/Userland/Libraries/LibCompress/Deflate.cpp index 30aa1bc68b..92fa588414 100644 --- a/Userland/Libraries/LibCompress/Deflate.cpp +++ b/Userland/Libraries/LibCompress/Deflate.cpp @@ -968,10 +968,8 @@ ErrorOr DeflateCompressor::flush() auto write_uncompressed = [&]() -> ErrorOr { TRY(m_output_stream->write_bits(0b00u, 2)); // no compression TRY(m_output_stream->align_to_byte_boundary()); - LittleEndian len = m_pending_block_size; - TRY(m_output_stream->write_until_depleted(len.bytes())); - LittleEndian nlen = ~m_pending_block_size; - TRY(m_output_stream->write_until_depleted(nlen.bytes())); + TRY(m_output_stream->write_value>(m_pending_block_size)); + TRY(m_output_stream->write_value>(~m_pending_block_size)); TRY(m_output_stream->write_until_depleted(pending_block().slice(0, m_pending_block_size))); return {}; }; diff --git a/Userland/Libraries/LibCompress/Gzip.cpp b/Userland/Libraries/LibCompress/Gzip.cpp index e47f010272..5f00fbd683 100644 --- a/Userland/Libraries/LibCompress/Gzip.cpp +++ b/Userland/Libraries/LibCompress/Gzip.cpp @@ -231,10 +231,8 @@ ErrorOr GzipCompressor::write_some(ReadonlyBytes bytes) TRY(compressed_stream->final_flush()); Crypto::Checksum::CRC32 crc32; crc32.update(bytes); - LittleEndian digest = crc32.digest(); - LittleEndian size = bytes.size(); - TRY(m_output_stream->write_until_depleted(digest.bytes())); - TRY(m_output_stream->write_until_depleted(size.bytes())); + TRY(m_output_stream->write_value>(crc32.digest())); + TRY(m_output_stream->write_value>(bytes.size())); return bytes.size(); } diff --git a/Userland/Libraries/LibCompress/Zlib.cpp b/Userland/Libraries/LibCompress/Zlib.cpp index 91f8413460..201b998901 100644 --- a/Userland/Libraries/LibCompress/Zlib.cpp +++ b/Userland/Libraries/LibCompress/Zlib.cpp @@ -113,7 +113,7 @@ ErrorOr ZlibCompressor::write_header(ZlibCompressionMethod compression_met // FIXME: Support pre-defined dictionaries. - TRY(m_output_stream->write_until_depleted(header.as_u16.bytes())); + TRY(m_output_stream->write_value(header.as_u16)); return {}; }