From c696197b03da5d4e3d55bf2e475e1a9eaa2a4c79 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Mon, 27 Oct 2025 10:19:24 +0000 Subject: [PATCH] formatting --- .../Common/Tar/TarReadOnlySubStream.cs | 8 +++++++- .../Compressors/Deflate/ZlibBaseStream.cs | 20 +++++++++++++------ tests/SharpCompress.Test/GZip/AsyncTests.cs | 4 ++-- .../GZip/GZipReaderAsyncTests.cs | 1 - 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs b/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs index ceb269bd..4e6ddb70 100644 --- a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs +++ b/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs @@ -106,6 +106,10 @@ internal class TarReadOnlySubStream : SharpCompressStream, IStreamStack public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync( + System.Threading.CancellationToken cancellationToken + ) => System.Threading.Tasks.Task.CompletedTask; + public override long Length => throw new NotSupportedException(); public override long Position @@ -155,7 +159,9 @@ internal class TarReadOnlySubStream : SharpCompressStream, IStreamStack { count = (int)BytesLeftToRead; } - var read = await Stream.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false); + var read = await Stream + .ReadAsync(buffer, offset, count, cancellationToken) + .ConfigureAwait(false); if (read > 0) { BytesLeftToRead -= read; diff --git a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs b/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs index 96651edb..e2a757c6 100644 --- a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs +++ b/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs @@ -764,7 +764,9 @@ internal class ZlibBaseStream : Stream, IStreamStack var extraLength = (short)(header[0] + header[1] * 256); var extra = new byte[extraLength]; - n = await _stream.ReadAsync(extra, 0, extra.Length, cancellationToken).ConfigureAwait(false); + n = await _stream + .ReadAsync(extra, 0, extra.Length, cancellationToken) + .ConfigureAwait(false); if (n != extraLength) { throw new ZlibException("Unexpected end-of-file reading GZIP header."); @@ -773,11 +775,13 @@ internal class ZlibBaseStream : Stream, IStreamStack } if ((header[3] & 0x08) == 0x08) { - _GzipFileName = await ReadZeroTerminatedStringAsync(cancellationToken).ConfigureAwait(false); + _GzipFileName = await ReadZeroTerminatedStringAsync(cancellationToken) + .ConfigureAwait(false); } if ((header[3] & 0x10) == 0x010) { - _GzipComment = await ReadZeroTerminatedStringAsync(cancellationToken).ConfigureAwait(false); + _GzipComment = await ReadZeroTerminatedStringAsync(cancellationToken) + .ConfigureAwait(false); } if ((header[3] & 0x02) == 0x02) { @@ -999,7 +1003,8 @@ internal class ZlibBaseStream : Stream, IStreamStack z.AvailableBytesIn = 0; if (_flavor == ZlibStreamFlavor.GZIP) { - _gzipHeaderByteCount = await _ReadAndValidateGzipHeaderAsync(cancellationToken).ConfigureAwait(false); + _gzipHeaderByteCount = await _ReadAndValidateGzipHeaderAsync(cancellationToken) + .ConfigureAwait(false); // workitem 8501: handle edge case (decompress empty stream) if (_gzipHeaderByteCount == 0) @@ -1077,7 +1082,9 @@ internal class ZlibBaseStream : Stream, IStreamStack { // No data available, so try to Read data from the captive stream. _z.NextIn = 0; - _z.AvailableBytesIn = await _stream.ReadAsync(_workingBuffer, 0, _workingBuffer.Length, cancellationToken).ConfigureAwait(false); + _z.AvailableBytesIn = await _stream + .ReadAsync(_workingBuffer, 0, _workingBuffer.Length, cancellationToken) + .ConfigureAwait(false); if (_z.AvailableBytesIn == 0) { nomoreinput = true; @@ -1170,7 +1177,8 @@ internal class ZlibBaseStream : Stream, IStreamStack byte[] array = System.Buffers.ArrayPool.Shared.Rent(buffer.Length); try { - int read = await ReadAsync(array, 0, buffer.Length, cancellationToken).ConfigureAwait(false); + int read = await ReadAsync(array, 0, buffer.Length, cancellationToken) + .ConfigureAwait(false); array.AsSpan(0, read).CopyTo(buffer.Span); return read; } diff --git a/tests/SharpCompress.Test/GZip/AsyncTests.cs b/tests/SharpCompress.Test/GZip/AsyncTests.cs index d0895067..5f2ed4fe 100644 --- a/tests/SharpCompress.Test/GZip/AsyncTests.cs +++ b/tests/SharpCompress.Test/GZip/AsyncTests.cs @@ -18,9 +18,9 @@ public class AsyncTests : TestBase public async Task Reader_Async_Extract_All() { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"); - #if NETFRAMEWORK +#if NETFRAMEWORK using var stream = File.OpenRead(testArchive); - #else +#else await using var stream = File.OpenRead(testArchive); #endif using var reader = ReaderFactory.Open(stream); diff --git a/tests/SharpCompress.Test/GZip/GZipReaderAsyncTests.cs b/tests/SharpCompress.Test/GZip/GZipReaderAsyncTests.cs index 70771ab1..20e9a34f 100644 --- a/tests/SharpCompress.Test/GZip/GZipReaderAsyncTests.cs +++ b/tests/SharpCompress.Test/GZip/GZipReaderAsyncTests.cs @@ -97,4 +97,3 @@ public class GZipReaderAsyncTests : ReaderTests } } } -