diff --git a/src/SharpCompress/Algorithms/Adler32.cs b/src/SharpCompress/Algorithms/Adler32.cs index 1f094c13..10dbfc4d 100644 --- a/src/SharpCompress/Algorithms/Adler32.cs +++ b/src/SharpCompress/Algorithms/Adler32.cs @@ -62,7 +62,7 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl public static int ReduceSum(Vector256 accumulator) { // Add upper lane to lower lane. - Vector128 vsum = Sse2.Add(accumulator.GetLower(), accumulator.GetUpper()); + var vsum = Sse2.Add(accumulator.GetLower(), accumulator.GetUpper()); // Add odd to even. vsum = Sse2.Add(vsum, Sse2.Shuffle(vsum, 0b_11_11_01_01)); @@ -81,7 +81,7 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int EvenReduceSum(Vector256 accumulator) { - Vector128 vsum = Sse2.Add(accumulator.GetLower(), accumulator.GetUpper()); // add upper lane to lower lane + var vsum = Sse2.Add(accumulator.GetLower(), accumulator.GetUpper()); // add upper lane to lower lane vsum = Sse2.Add(vsum, Sse2.Shuffle(vsum, 0b_11_10_11_10)); // add high to low // Vector128.ToScalar() isn't optimized pre-net5.0 https://github.com/dotnet/runtime/pull/37882 @@ -189,29 +189,29 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl [MethodImpl(InliningOptions.HotPath | InliningOptions.ShortMethod)] private static unsafe uint CalculateSse(uint adler, ReadOnlySpan buffer) { - uint s1 = adler & 0xFFFF; - uint s2 = (adler >> 16) & 0xFFFF; + var s1 = adler & 0xFFFF; + var s2 = (adler >> 16) & 0xFFFF; // Process the data in blocks. - uint length = (uint)buffer.Length; - uint blocks = length / BlockSize; + var length = (uint)buffer.Length; + var blocks = length / BlockSize; length -= blocks * BlockSize; fixed (byte* bufferPtr = &MemoryMarshal.GetReference(buffer)) { fixed (byte* tapPtr = &MemoryMarshal.GetReference(Tap1Tap2)) { - byte* localBufferPtr = bufferPtr; + var localBufferPtr = bufferPtr; // _mm_setr_epi8 on x86 - Vector128 tap1 = Sse2.LoadVector128((sbyte*)tapPtr); - Vector128 tap2 = Sse2.LoadVector128((sbyte*)(tapPtr + 0x10)); - Vector128 zero = Vector128.Zero; + var tap1 = Sse2.LoadVector128((sbyte*)tapPtr); + var tap2 = Sse2.LoadVector128((sbyte*)(tapPtr + 0x10)); + var zero = Vector128.Zero; var ones = Vector128.Create((short)1); while (blocks > 0) { - uint n = NMAX / BlockSize; /* The NMAX constraint. */ + var n = NMAX / BlockSize; /* The NMAX constraint. */ if (n > blocks) { n = blocks; @@ -221,15 +221,15 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl // Process n blocks of data. At most NMAX data bytes can be // processed before s2 must be reduced modulo BASE. - Vector128 v_ps = Vector128.CreateScalar(s1 * n); - Vector128 v_s2 = Vector128.CreateScalar(s2); - Vector128 v_s1 = Vector128.Zero; + var v_ps = Vector128.CreateScalar(s1 * n); + var v_s2 = Vector128.CreateScalar(s2); + var v_s1 = Vector128.Zero; do { // Load 32 input bytes. - Vector128 bytes1 = Sse3.LoadDquVector128(localBufferPtr); - Vector128 bytes2 = Sse3.LoadDquVector128(localBufferPtr + 0x10); + var bytes1 = Sse3.LoadDquVector128(localBufferPtr); + var bytes2 = Sse3.LoadDquVector128(localBufferPtr + 0x10); // Add previous block byte sum to v_ps. v_ps = Sse2.Add(v_ps, v_s1); @@ -237,11 +237,11 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl // Horizontally add the bytes for s1, multiply-adds the // bytes by [ 32, 31, 30, ... ] for s2. v_s1 = Sse2.Add(v_s1, Sse2.SumAbsoluteDifferences(bytes1, zero).AsUInt32()); - Vector128 mad1 = Ssse3.MultiplyAddAdjacent(bytes1, tap1); + var mad1 = Ssse3.MultiplyAddAdjacent(bytes1, tap1); v_s2 = Sse2.Add(v_s2, Sse2.MultiplyAddAdjacent(mad1, ones).AsUInt32()); v_s1 = Sse2.Add(v_s1, Sse2.SumAbsoluteDifferences(bytes2, zero).AsUInt32()); - Vector128 mad2 = Ssse3.MultiplyAddAdjacent(bytes2, tap2); + var mad2 = Ssse3.MultiplyAddAdjacent(bytes2, tap2); v_s2 = Sse2.Add(v_s2, Sse2.MultiplyAddAdjacent(mad2, ones).AsUInt32()); localBufferPtr += BlockSize; @@ -281,15 +281,15 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl [MethodImpl(InliningOptions.HotPath | InliningOptions.ShortMethod)] public static unsafe uint CalculateAvx2(uint adler, ReadOnlySpan buffer) { - uint s1 = adler & 0xFFFF; - uint s2 = (adler >> 16) & 0xFFFF; - uint length = (uint)buffer.Length; + var s1 = adler & 0xFFFF; + var s2 = (adler >> 16) & 0xFFFF; + var length = (uint)buffer.Length; fixed (byte* bufferPtr = &MemoryMarshal.GetReference(buffer)) { - byte* localBufferPtr = bufferPtr; + var localBufferPtr = bufferPtr; - Vector256 zero = Vector256.Zero; + var zero = Vector256.Zero; var dot3v = Vector256.Create((short)1); var dot2v = Vector256.Create( 32, @@ -333,29 +333,29 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl while (length >= 32) { - int k = length < NMAX ? (int)length : (int)NMAX; + var k = length < NMAX ? (int)length : (int)NMAX; k -= k % 32; length -= (uint)k; - Vector256 vs10 = vs1; - Vector256 vs3 = Vector256.Zero; + var vs10 = vs1; + var vs3 = Vector256.Zero; while (k >= 32) { // Load 32 input bytes. - Vector256 block = Avx.LoadVector256(localBufferPtr); + var block = Avx.LoadVector256(localBufferPtr); // Sum of abs diff, resulting in 2 x int32's - Vector256 vs1sad = Avx2.SumAbsoluteDifferences(block, zero); + var vs1sad = Avx2.SumAbsoluteDifferences(block, zero); vs1 = Avx2.Add(vs1, vs1sad.AsUInt32()); vs3 = Avx2.Add(vs3, vs10); // sum 32 uint8s to 16 shorts. - Vector256 vshortsum2 = Avx2.MultiplyAddAdjacent(block, dot2v); + var vshortsum2 = Avx2.MultiplyAddAdjacent(block, dot2v); // sum 16 shorts to 8 uint32s. - Vector256 vsum2 = Avx2.MultiplyAddAdjacent(vshortsum2, dot3v); + var vsum2 = Avx2.MultiplyAddAdjacent(vshortsum2, dot3v); vs2 = Avx2.Add(vsum2.AsUInt32(), vs2); vs10 = vs1; @@ -434,14 +434,14 @@ internal static class Adler32 // From https://github.com/SixLabors/ImageSharp/bl [MethodImpl(InliningOptions.HotPath | InliningOptions.ShortMethod)] private static unsafe uint CalculateScalar(uint adler, ReadOnlySpan buffer) { - uint s1 = adler & 0xFFFF; - uint s2 = (adler >> 16) & 0xFFFF; + var s1 = adler & 0xFFFF; + var s2 = (adler >> 16) & 0xFFFF; uint k; fixed (byte* bufferPtr = buffer) { var localBufferPtr = bufferPtr; - uint length = (uint)buffer.Length; + var length = (uint)buffer.Length; while (length > 0) { diff --git a/src/SharpCompress/Archives/ArchiveVolumeFactory.cs b/src/SharpCompress/Archives/ArchiveVolumeFactory.cs index d8f5535f..81a5d4fd 100644 --- a/src/SharpCompress/Archives/ArchiveVolumeFactory.cs +++ b/src/SharpCompress/Archives/ArchiveVolumeFactory.cs @@ -11,7 +11,7 @@ internal abstract class ArchiveVolumeFactory FileInfo? item = null; //split 001, 002 ... - Match m = Regex.Match(part1.Name, @"^(.*\.)([0-9]+)$", RegexOptions.IgnoreCase); + var m = Regex.Match(part1.Name, @"^(.*\.)([0-9]+)$", RegexOptions.IgnoreCase); if (m.Success) item = new FileInfo( Path.Combine( diff --git a/src/SharpCompress/Archives/Rar/RarArchiveVolumeFactory.cs b/src/SharpCompress/Archives/Rar/RarArchiveVolumeFactory.cs index 72ccf60f..f5ce89b8 100644 --- a/src/SharpCompress/Archives/Rar/RarArchiveVolumeFactory.cs +++ b/src/SharpCompress/Archives/Rar/RarArchiveVolumeFactory.cs @@ -11,7 +11,7 @@ internal static class RarArchiveVolumeFactory FileInfo? item = null; //new style rar - ..part1 | /part01 | part001 .... - Match m = Regex.Match(part1.Name, @"^(.*\.part)([0-9]+)(\.rar)$", RegexOptions.IgnoreCase); + var m = Regex.Match(part1.Name, @"^(.*\.part)([0-9]+)(\.rar)$", RegexOptions.IgnoreCase); if (m.Success) item = new FileInfo( Path.Combine( diff --git a/src/SharpCompress/Archives/Zip/ZipArchiveVolumeFactory.cs b/src/SharpCompress/Archives/Zip/ZipArchiveVolumeFactory.cs index fdaa85b9..1b2f093d 100644 --- a/src/SharpCompress/Archives/Zip/ZipArchiveVolumeFactory.cs +++ b/src/SharpCompress/Archives/Zip/ZipArchiveVolumeFactory.cs @@ -12,7 +12,7 @@ internal static class ZipArchiveVolumeFactory //load files with zip/zipx first. Swapped to end once loaded in ZipArchive //new style .zip, z01.. | .zipx, zx01 - if the numbers go beyond 99 then they use 100 ...1000 etc - Match m = Regex.Match(part1.Name, @"^(.*\.)(zipx?|zx?[0-9]+)$", RegexOptions.IgnoreCase); + var m = Regex.Match(part1.Name, @"^(.*\.)(zipx?|zx?[0-9]+)$", RegexOptions.IgnoreCase); if (m.Success) item = new FileInfo( Path.Combine( diff --git a/src/SharpCompress/Common/ExtractionMethods.cs b/src/SharpCompress/Common/ExtractionMethods.cs index c8e5896e..a470637a 100644 --- a/src/SharpCompress/Common/ExtractionMethods.cs +++ b/src/SharpCompress/Common/ExtractionMethods.cs @@ -16,7 +16,7 @@ internal static class ExtractionMethods ) { string destinationFileName; - string fullDestinationDirectoryPath = Path.GetFullPath(destinationDirectory); + var fullDestinationDirectoryPath = Path.GetFullPath(destinationDirectory); //check for trailing slash. if ( @@ -36,11 +36,11 @@ internal static class ExtractionMethods options ??= new ExtractionOptions() { Overwrite = true }; - string file = Path.GetFileName(entry.Key); + var file = Path.GetFileName(entry.Key); if (options.ExtractFullPath) { - string folder = Path.GetDirectoryName(entry.Key)!; - string destdir = Path.GetFullPath(Path.Combine(fullDestinationDirectoryPath, folder)); + var folder = Path.GetDirectoryName(entry.Key)!; + var destdir = Path.GetFullPath(Path.Combine(fullDestinationDirectoryPath, folder)); if (!Directory.Exists(destdir)) { @@ -102,7 +102,7 @@ internal static class ExtractionMethods } else { - FileMode fm = FileMode.Create; + var fm = FileMode.Create; options ??= new ExtractionOptions() { Overwrite = true }; if (!options.Overwrite) diff --git a/src/SharpCompress/Common/Rar/CryptKey5.cs b/src/SharpCompress/Common/Rar/CryptKey5.cs index 31e2c7b8..0b802691 100644 --- a/src/SharpCompress/Common/Rar/CryptKey5.cs +++ b/src/SharpCompress/Common/Rar/CryptKey5.cs @@ -34,19 +34,19 @@ internal class CryptKey5 : ICryptKey int keyLength ) { - using HMACSHA256 hmac = new HMACSHA256(Encoding.UTF8.GetBytes(password)); - byte[] block = hmac.ComputeHash(salt); - byte[] finalHash = (byte[])block.Clone(); + using var hmac = new HMACSHA256(Encoding.UTF8.GetBytes(password)); + var block = hmac.ComputeHash(salt); + var finalHash = (byte[])block.Clone(); var loop = new int[] { iterations, 17, 17 }; var res = new List { }; - for (int x = 0; x < 3; x++) + for (var x = 0; x < 3; x++) { - for (int i = 1; i < loop[x]; i++) + for (var i = 1; i < loop[x]; i++) { block = hmac.ComputeHash(block); - for (int j = 0; j < finalHash.Length; j++) + for (var j = 0; j < finalHash.Length; j++) { finalHash[j] ^= block[j]; } @@ -60,7 +60,7 @@ internal class CryptKey5 : ICryptKey public ICryptoTransform Transformer(byte[] salt) { - int iterations = (1 << _cryptoInfo.LG2Count); // Adjust the number of iterations as needed + var iterations = (1 << _cryptoInfo.LG2Count); // Adjust the number of iterations as needed var salt_rar5 = salt.Concat(new byte[] { 0, 0, 0, 1 }); var derivedKey = GenerateRarPBKDF2Key( @@ -74,7 +74,7 @@ internal class CryptKey5 : ICryptKey _pswCheck = new byte[EncryptionConstV5.SIZE_PSWCHECK]; - for (int i = 0; i < SHA256_DIGEST_SIZE; i++) + for (var i = 0; i < SHA256_DIGEST_SIZE; i++) { _pswCheck[i % EncryptionConstV5.SIZE_PSWCHECK] ^= derivedKey[2][i]; } diff --git a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs b/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs index 2a340dea..09a2fdb8 100644 --- a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs +++ b/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs @@ -63,7 +63,7 @@ internal class TarReadOnlySubStream : NonDisposingStream { count = (int)BytesLeftToRead; } - int read = Stream.Read(buffer, offset, count); + var read = Stream.Read(buffer, offset, count); if (read > 0) { BytesLeftToRead -= read; @@ -78,7 +78,7 @@ internal class TarReadOnlySubStream : NonDisposingStream { return -1; } - int value = Stream.ReadByte(); + var value = Stream.ReadByte(); if (value != -1) { --BytesLeftToRead; diff --git a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs b/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs index 8248e900..94b1491d 100644 --- a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs +++ b/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs @@ -102,7 +102,7 @@ internal class ZlibBaseStream : Stream { if (_z is null) { - bool wantRfc1950Header = (_flavor == ZlibStreamFlavor.ZLIB); + var wantRfc1950Header = (_flavor == ZlibStreamFlavor.ZLIB); _z = new ZlibCodec(); if (_compressionMode == CompressionMode.Decompress) { @@ -147,13 +147,13 @@ internal class ZlibBaseStream : Stream z.InputBuffer = buffer; _z.NextIn = offset; _z.AvailableBytesIn = count; - bool done = false; + var done = false; do { _z.OutputBuffer = workingBuffer; _z.NextOut = 0; _z.AvailableBytesOut = _workingBuffer.Length; - int rc = (_wantCompress) ? _z.Deflate(_flushMode) : _z.Inflate(_flushMode); + var rc = (_wantCompress) ? _z.Deflate(_flushMode) : _z.Inflate(_flushMode); if (rc != ZlibConstants.Z_OK && rc != ZlibConstants.Z_STREAM_END) { throw new ZlibException((_wantCompress ? "de" : "in") + "flating: " + _z.Message); @@ -181,18 +181,18 @@ internal class ZlibBaseStream : Stream if (_streamMode == StreamMode.Writer) { - bool done = false; + var done = false; do { _z.OutputBuffer = workingBuffer; _z.NextOut = 0; _z.AvailableBytesOut = _workingBuffer.Length; - int rc = + var rc = (_wantCompress) ? _z.Deflate(FlushType.Finish) : _z.Inflate(FlushType.Finish); if (rc != ZlibConstants.Z_STREAM_END && rc != ZlibConstants.Z_OK) { - string verb = (_wantCompress ? "de" : "in") + "flating"; + var verb = (_wantCompress ? "de" : "in") + "flating"; if (_z.Message is null) { throw new ZlibException(String.Format("{0}: (rc = {1})", verb, rc)); @@ -225,7 +225,7 @@ internal class ZlibBaseStream : Stream Span intBuf = stackalloc byte[4]; BinaryPrimitives.WriteInt32LittleEndian(intBuf, crc.Crc32Result); _stream.Write(intBuf); - int c2 = (int)(crc.TotalBytesRead & 0x00000000FFFFFFFF); + var c2 = (int)(crc.TotalBytesRead & 0x00000000FFFFFFFF); BinaryPrimitives.WriteInt32LittleEndian(intBuf, c2); _stream.Write(intBuf); } @@ -256,8 +256,8 @@ internal class ZlibBaseStream : Stream { // Make sure we have read to the end of the stream _z.InputBuffer.AsSpan(_z.NextIn, _z.AvailableBytesIn).CopyTo(trailer); - int bytesNeeded = 8 - _z.AvailableBytesIn; - int bytesRead = _stream.Read( + var bytesNeeded = 8 - _z.AvailableBytesIn; + var bytesRead = _stream.Read( trailer.Slice(_z.AvailableBytesIn, bytesNeeded) ); if (bytesNeeded != bytesRead) @@ -275,10 +275,10 @@ internal class ZlibBaseStream : Stream _z.InputBuffer.AsSpan(_z.NextIn, trailer.Length).CopyTo(trailer); } - Int32 crc32_expected = BinaryPrimitives.ReadInt32LittleEndian(trailer); - Int32 crc32_actual = crc.Crc32Result; - Int32 isize_expected = BinaryPrimitives.ReadInt32LittleEndian(trailer.Slice(4)); - Int32 isize_actual = (Int32)(_z.TotalBytesOut & 0x00000000FFFFFFFF); + var crc32_expected = BinaryPrimitives.ReadInt32LittleEndian(trailer); + var crc32_actual = crc.Crc32Result; + var isize_expected = BinaryPrimitives.ReadInt32LittleEndian(trailer.Slice(4)); + var isize_actual = (Int32)(_z.TotalBytesOut & 0x00000000FFFFFFFF); if (crc32_actual != crc32_expected) { @@ -380,11 +380,11 @@ internal class ZlibBaseStream : Stream private string ReadZeroTerminatedString() { var list = new List(); - bool done = false; + var done = false; do { // workitem 7740 - int n = _stream.Read(_buf1, 0, 1); + var n = _stream.Read(_buf1, 0, 1); if (n != 1) { throw new ZlibException("Unexpected EOF reading GZIP header."); @@ -398,17 +398,17 @@ internal class ZlibBaseStream : Stream list.Add(_buf1[0]); } } while (!done); - byte[] buffer = list.ToArray(); + var buffer = list.ToArray(); return _encoding.GetString(buffer, 0, buffer.Length); } private int _ReadAndValidateGzipHeader() { - int totalBytesRead = 0; + var totalBytesRead = 0; // read the header on the first read Span header = stackalloc byte[10]; - int n = _stream.Read(header); + var n = _stream.Read(header); // workitem 8501: handle edge case (decompress empty stream) if (n == 0) @@ -426,7 +426,7 @@ internal class ZlibBaseStream : Stream throw new ZlibException("Bad GZIP header."); } - int timet = BinaryPrimitives.ReadInt32LittleEndian(header.Slice(4)); + var timet = BinaryPrimitives.ReadInt32LittleEndian(header.Slice(4)); _GzipMtime = TarHeader.EPOCH.AddSeconds(timet); totalBytesRead += n; if ((header[3] & 0x04) == 0x04) @@ -435,8 +435,8 @@ internal class ZlibBaseStream : Stream n = _stream.Read(header.Slice(0, 2)); // 2-byte length field totalBytesRead += n; - short extraLength = (short)(header[0] + header[1] * 256); - byte[] extra = new byte[extraLength]; + var extraLength = (short)(header[0] + header[1] * 256); + var extra = new byte[extraLength]; n = _stream.Read(extra, 0, extra.Length); if (n != extraLength) { @@ -498,7 +498,7 @@ internal class ZlibBaseStream : Stream throw new ZlibException("Cannot Read after Writing."); } - int rc = 0; + var rc = 0; // set up the output of the deflate/inflate codec: _z.OutputBuffer = buffer; diff --git a/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs b/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs index 3eda232c..da4117b9 100644 --- a/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs +++ b/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs @@ -118,8 +118,8 @@ public sealed class Deflate64Stream : Stream EnsureNotDisposed(); int bytesRead; - int currentOffset = offset; - int remainingCount = count; + var currentOffset = offset; + var remainingCount = count; while (true) { @@ -142,7 +142,7 @@ public sealed class Deflate64Stream : Stream break; } - int bytes = _stream.Read(_buffer, 0, _buffer.Length); + var bytes = _stream.Read(_buffer, 0, _buffer.Length); if (bytes <= 0) { break; diff --git a/src/SharpCompress/Compressors/Filters/BCJFilterARM.cs b/src/SharpCompress/Compressors/Filters/BCJFilterARM.cs index 86e90b10..5d861621 100644 --- a/src/SharpCompress/Compressors/Filters/BCJFilterARM.cs +++ b/src/SharpCompress/Compressors/Filters/BCJFilterARM.cs @@ -18,7 +18,7 @@ internal class BCJFilterARM : Filter { if ((buffer[i + 3] & 0xFF) == 0xEB) { - int src = + var src = ((buffer[i + 2] & 0xFF) << 16) | ((buffer[i + 1] & 0xFF) << 8) | (buffer[i] & 0xFF); diff --git a/src/SharpCompress/Compressors/Filters/BCJFilterARMT.cs b/src/SharpCompress/Compressors/Filters/BCJFilterARMT.cs index d2ad1bbf..db5b36f2 100644 --- a/src/SharpCompress/Compressors/Filters/BCJFilterARMT.cs +++ b/src/SharpCompress/Compressors/Filters/BCJFilterARMT.cs @@ -18,7 +18,7 @@ internal class BCJFilterARMT : Filter { if ((buffer[i + 1] & 0xF8) == 0xF0 && (buffer[i + 3] & 0xF8) == 0xF8) { - int src = + var src = ((buffer[i + 1] & 0x07) << 19) | ((buffer[i] & 0xFF) << 11) | ((buffer[i + 3] & 0x07) << 8) diff --git a/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs b/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs index 4d89ba39..07eaf319 100644 --- a/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs +++ b/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs @@ -52,29 +52,29 @@ internal class BCJFilterIA64 : Filter for (i = offset; i <= end; i += 16) { - int instrTemplate = buffer[i] & 0x1F; - int mask = BRANCH_TABLE[instrTemplate]; + var instrTemplate = buffer[i] & 0x1F; + var mask = BRANCH_TABLE[instrTemplate]; for (int slot = 0, bitPos = 5; slot < 3; ++slot, bitPos += 41) { if (((mask >>> slot) & 1) == 0) continue; - int bytePos = bitPos >>> 3; - int bitRes = bitPos & 7; + var bytePos = bitPos >>> 3; + var bitRes = bitPos & 7; long instr = 0; - for (int j = 0; j < 6; ++j) + for (var j = 0; j < 6; ++j) { instr |= (buffer[i + bytePos + j] & 0xFFL) << (8 * j); } - long instrNorm = instr >>> bitRes; + var instrNorm = instr >>> bitRes; if (((instrNorm >>> 37) & 0x0F) != 0x05 || ((instrNorm >>> 9) & 0x07) != 0x00) continue; - int src = (int)((instrNorm >>> 13) & 0x0FFFFF); + var src = (int)((instrNorm >>> 13) & 0x0FFFFF); src |= ((int)(instrNorm >>> 36) & 1) << 20; src <<= 4; @@ -93,7 +93,7 @@ internal class BCJFilterIA64 : Filter instr &= (1 << bitRes) - 1; instr |= instrNorm << bitRes; - for (int j = 0; j < 6; ++j) + for (var j = 0; j < 6; ++j) { buffer[i + bytePos + j] = (byte)(instr >>> (8 * j)); } diff --git a/src/SharpCompress/Compressors/Filters/BCJFilterPPC.cs b/src/SharpCompress/Compressors/Filters/BCJFilterPPC.cs index 11ed61a1..ccfa7480 100644 --- a/src/SharpCompress/Compressors/Filters/BCJFilterPPC.cs +++ b/src/SharpCompress/Compressors/Filters/BCJFilterPPC.cs @@ -18,7 +18,7 @@ internal class BCJFilterPPC : Filter { if ((buffer[i] & 0xFC) == 0x48 && (buffer[i + 3] & 0x03) == 0x01) { - int src = + var src = ((buffer[i] & 0x03) << 24) | ((buffer[i + 1] & 0xFF) << 16) | ((buffer[i + 2] & 0xFF) << 8) diff --git a/src/SharpCompress/Compressors/Filters/BCJFilterSPARC.cs b/src/SharpCompress/Compressors/Filters/BCJFilterSPARC.cs index 67756d34..db7c75be 100644 --- a/src/SharpCompress/Compressors/Filters/BCJFilterSPARC.cs +++ b/src/SharpCompress/Compressors/Filters/BCJFilterSPARC.cs @@ -21,7 +21,7 @@ internal class BCJFilterSPARC : Filter || (buffer[i] == 0x7F && (buffer[i + 1] & 0xC0) == 0xC0) ) { - int src = + var src = ((buffer[i] & 0xFF) << 24) | ((buffer[i + 1] & 0xFF) << 16) | ((buffer[i + 2] & 0xFF) << 8) diff --git a/src/SharpCompress/Compressors/Filters/BranchExecFilter.cs b/src/SharpCompress/Compressors/Filters/BranchExecFilter.cs index 9fc439d4..f70d6c11 100644 --- a/src/SharpCompress/Compressors/Filters/BranchExecFilter.cs +++ b/src/SharpCompress/Compressors/Filters/BranchExecFilter.cs @@ -34,30 +34,20 @@ public sealed class BranchExecFilter //The previous version of the code would corrupt 2 bytes in the Test.exe at 0x6CF9 (3D6D - should be 4000) - Test zip: WinZip27.Xz.zipx public static void X86Converter(byte[] buf, uint ip, ref uint state) { - bool[] mask_to_allowed_status = new[] - { - true, - true, - true, - false, - true, - false, - false, - false - }; + var mask_to_allowed_status = new[] { true, true, true, false, true, false, false, false }; - byte[] mask_to_bit_num = new byte[] { 0, 1, 2, 2, 3, 3, 3, 3 }; + var mask_to_bit_num = new byte[] { 0, 1, 2, 2, 3, 3, 3, 3 }; int i; - int prev_pos = -1; - uint prev_mask = state & 7; + var prev_pos = -1; + var prev_mask = state & 7; uint src; uint dest; uint j; byte b; - uint pos = ip; + var pos = ip; - uint size = (uint)buf.Length; + var size = (uint)buf.Length; if (size <= 4) return; diff --git a/src/SharpCompress/Compressors/Filters/DeltaFilter.cs b/src/SharpCompress/Compressors/Filters/DeltaFilter.cs index c5fbeb41..85ec9b15 100644 --- a/src/SharpCompress/Compressors/Filters/DeltaFilter.cs +++ b/src/SharpCompress/Compressors/Filters/DeltaFilter.cs @@ -23,9 +23,9 @@ namespace SharpCompress.Compressors.Filters protected override int Transform(byte[] buffer, int offset, int count) { - int end = offset + count; + var end = offset + count; - for (int i = offset; i < end; i++) + for (var i = offset; i < end; i++) { buffer[i] += _history[(_distance + _position--) & DISTANCE_MASK]; _history[_position & DISTANCE_MASK] = buffer[i]; diff --git a/src/SharpCompress/Compressors/LZMA/AesDecoderStream.cs b/src/SharpCompress/Compressors/LZMA/AesDecoderStream.cs index 24823c73..8e884c97 100644 --- a/src/SharpCompress/Compressors/LZMA/AesDecoderStream.cs +++ b/src/SharpCompress/Compressors/LZMA/AesDecoderStream.cs @@ -35,10 +35,10 @@ internal sealed class AesDecoderStream : DecoderStream2 throw new NotSupportedException("AES decoder does not support padding."); } - Init(info, out int numCyclesPower, out byte[] salt, out byte[] seed); + Init(info, out var numCyclesPower, out var salt, out var seed); - byte[] password = Encoding.Unicode.GetBytes(pass.CryptoGetTextPassword()); - byte[]? key = InitKey(numCyclesPower, salt, password); + var password = Encoding.Unicode.GetBytes(pass.CryptoGetTextPassword()); + var key = InitKey(numCyclesPower, salt, password); if (key == null) { throw new InvalidOperationException("Initialized with null key"); @@ -100,7 +100,7 @@ internal sealed class AesDecoderStream : DecoderStream2 do { - int read = mStream.Read(mBuffer, mEnding, mBuffer.Length - mEnding); + var read = mStream.Read(mBuffer, mEnding, mBuffer.Length - mEnding); if (read == 0) { // We are not done decoding and have less than 16 bytes. @@ -133,7 +133,7 @@ internal sealed class AesDecoderStream : DecoderStream2 } // Otherwise we transform directly into the target buffer. - int processed = mDecoder.TransformBlock(mBuffer, mOffset, count & ~15, buffer, offset); + var processed = mDecoder.TransformBlock(mBuffer, mOffset, count & ~15, buffer, offset); mOffset += processed; mWritten += processed; return processed; @@ -143,7 +143,7 @@ internal sealed class AesDecoderStream : DecoderStream2 private void Init(byte[] info, out int numCyclesPower, out byte[] salt, out byte[] iv) { - byte bt = info[0]; + var bt = info[0]; numCyclesPower = bt & 0x3F; if ((bt & 0xC0) == 0) @@ -153,14 +153,14 @@ internal sealed class AesDecoderStream : DecoderStream2 return; } - int saltSize = (bt >> 7) & 1; - int ivSize = (bt >> 6) & 1; + var saltSize = (bt >> 7) & 1; + var ivSize = (bt >> 6) & 1; if (info.Length == 1) { throw new InvalidOperationException(); } - byte bt2 = info[1]; + var bt2 = info[1]; saltSize += (bt2 >> 4); ivSize += (bt2 & 15); if (info.Length < 2 + saltSize + ivSize) @@ -169,13 +169,13 @@ internal sealed class AesDecoderStream : DecoderStream2 } salt = new byte[saltSize]; - for (int i = 0; i < saltSize; i++) + for (var i = 0; i < saltSize; i++) { salt[i] = info[i + 2]; } iv = new byte[16]; - for (int i = 0; i < ivSize; i++) + for (var i = 0; i < ivSize; i++) { iv[i] = info[i + saltSize + 2]; } @@ -198,7 +198,7 @@ internal sealed class AesDecoderStream : DecoderStream2 key[pos] = salt[pos]; } - for (int i = 0; i < pass.Length && pos < 32; i++) + for (var i = 0; i < pass.Length && pos < 32; i++) { key[pos++] = pass[i]; } @@ -208,9 +208,9 @@ internal sealed class AesDecoderStream : DecoderStream2 else { #if NETSTANDARD2_0 - using IncrementalHash sha = IncrementalHash.CreateHash(HashAlgorithmName.SHA256); - byte[] counter = new byte[8]; - long numRounds = 1L << mNumCyclesPower; + using var sha = IncrementalHash.CreateHash(HashAlgorithmName.SHA256); + var counter = new byte[8]; + var numRounds = 1L << mNumCyclesPower; for (long round = 0; round < numRounds; round++) { sha.AppendData(salt, 0, salt.Length); @@ -219,7 +219,7 @@ internal sealed class AesDecoderStream : DecoderStream2 // This mirrors the counter so we don't have to convert long to byte[] each round. // (It also ensures the counter is little endian, which BitConverter does not.) - for (int i = 0; i < 8; i++) + for (var i = 0; i < 8; i++) { if (++counter[i] != 0) { @@ -230,8 +230,8 @@ internal sealed class AesDecoderStream : DecoderStream2 return sha.GetHashAndReset(); #else using var sha = SHA256.Create(); - byte[] counter = new byte[8]; - long numRounds = 1L << mNumCyclesPower; + var counter = new byte[8]; + var numRounds = 1L << mNumCyclesPower; for (long round = 0; round < numRounds; round++) { sha.TransformBlock(salt, 0, salt.Length, null, 0); @@ -240,7 +240,7 @@ internal sealed class AesDecoderStream : DecoderStream2 // This mirrors the counter so we don't have to convert long to byte[] each round. // (It also ensures the counter is little endian, which BitConverter does not.) - for (int i = 0; i < 8; i++) + for (var i = 0; i < 8; i++) { if (++counter[i] != 0) { @@ -261,7 +261,7 @@ internal sealed class AesDecoderStream : DecoderStream2 // Just transform as much as possible so we can feed from it as long as possible. if (mUnderflow == 0) { - int blockSize = (mEnding - mOffset) & ~15; + var blockSize = (mEnding - mOffset) & ~15; mUnderflow = mDecoder.TransformBlock(mBuffer, mOffset, blockSize, mBuffer, mOffset); } diff --git a/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs b/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs index e42f8069..7a231289 100644 --- a/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs +++ b/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs @@ -1727,7 +1727,7 @@ internal class Encoder : ICoder, ISetCoderProperties, IWriteCoderProperties ReadOnlySpan properties ) { - for (int i = 0; i < properties.Length; i++) + for (var i = 0; i < properties.Length; i++) { var prop = properties[i]; switch (propIDs[i]) diff --git a/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs b/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs index d3e90c4c..7c897176 100644 --- a/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs +++ b/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs @@ -73,7 +73,7 @@ internal class RarBLAKE2spStream : RarStream public BLAKE2SP() { S = new BLAKE2S[BLAKE2SP_PARALLEL_DEGREE]; - for (int i = 0; i < S.Length; i++) + for (var i = 0; i < S.Length; i++) { S[i] = new BLAKE2S(); } @@ -141,15 +141,15 @@ internal class RarBLAKE2spStream : RarStream internal void Compress(BLAKE2S hash) { - UInt32[] m = new UInt32[16]; - UInt32[] v = new UInt32[16]; + var m = new UInt32[16]; + var v = new UInt32[16]; - for (int i = 0; i < 16; i++) + for (var i = 0; i < 16; i++) { m[i] = BitConverter.ToUInt32(hash.b, i * 4); } - for (int i = 0; i < 8; i++) + for (var i = 0; i < 8; i++) { v[i] = hash.h[i]; } @@ -164,7 +164,7 @@ internal class RarBLAKE2spStream : RarStream v[14] = hash.f[0] ^ k_BLAKE2S_IV[6]; v[15] = hash.f[1] ^ k_BLAKE2S_IV[7]; - for (int r = 0; r < BLAKE2S_NUM_ROUNDS; r++) + for (var r = 0; r < BLAKE2S_NUM_ROUNDS; r++) { ref byte[] sigma = ref k_BLAKE2S_Sigma[r]; @@ -178,7 +178,7 @@ internal class RarBLAKE2spStream : RarStream G(ref m, ref sigma, 7, ref v[3], ref v[4], ref v[9], ref v[14]); } - for (int i = 0; i < 8; i++) + for (var i = 0; i < 8; i++) { hash.h[i] ^= v[i] ^ v[i + 8]; } @@ -186,7 +186,7 @@ internal class RarBLAKE2spStream : RarStream internal void Update(BLAKE2S hash, ReadOnlySpan data, int size) { - int i = 0; + var i = 0; while (size != 0) { var pos = hash.bufferPosition; @@ -219,7 +219,7 @@ internal class RarBLAKE2spStream : RarStream var mem = new MemoryStream(); - for (int i = 0; i < 8; i++) + for (var i = 0; i < 8; i++) { mem.Write(BitConverter.GetBytes(hash.h[i]), 0, 4); } @@ -245,7 +245,7 @@ internal class RarBLAKE2spStream : RarStream internal void Update(BLAKE2SP hash, ReadOnlySpan data, int size) { - int i = 0; + var i = 0; var pos = hash.bufferPosition; while (size != 0) { @@ -274,7 +274,7 @@ internal class RarBLAKE2spStream : RarStream h.h[3] ^= (1 << 16 | BLAKE2S_DIGEST_SIZE << 24); h.lastNodeFlag = BLAKE2S_FINAL_FLAG; - for (int i = 0; i < BLAKE2SP_PARALLEL_DEGREE; i++) + for (var i = 0; i < BLAKE2SP_PARALLEL_DEGREE; i++) { var digest = Final(_blake2sp.S[i]); Update(h, digest, BLAKE2S_DIGEST_SIZE); diff --git a/src/SharpCompress/Compressors/Shrink/BitStream.cs b/src/SharpCompress/Compressors/Shrink/BitStream.cs index ef01e2af..949ee6c3 100644 --- a/src/SharpCompress/Compressors/Shrink/BitStream.cs +++ b/src/SharpCompress/Compressors/Shrink/BitStream.cs @@ -57,7 +57,7 @@ namespace SharpCompress.Compressors.Shrink public int NextBits(int nbits) { - int result = 0; + var result = 0; if (nbits > _bitsLeft) { int num; diff --git a/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs b/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs index 04f38c2b..3eb10e6b 100644 --- a/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs +++ b/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs @@ -27,14 +27,14 @@ namespace SharpCompress.Compressors.Shrink private static void CodeTabInit(CodeTabEntry[] codeTab) { - for (int i = 0; i <= byte.MaxValue; i++) + for (var i = 0; i <= byte.MaxValue; i++) { codeTab[i].prefixCode = (ushort)i; codeTab[i].extByte = (byte)i; codeTab[i].len = 1; } - for (int i = byte.MaxValue + 1; i <= MAX_CODE; i++) + for (var i = byte.MaxValue + 1; i <= MAX_CODE; i++) { codeTab[i].prefixCode = INVALID_CODE; } @@ -42,11 +42,11 @@ namespace SharpCompress.Compressors.Shrink private static void UnshrinkPartialClear(CodeTabEntry[] codeTab, ref CodeQueue queue) { - bool[] isPrefix = new bool[MAX_CODE + 1]; + var isPrefix = new bool[MAX_CODE + 1]; int codeQueueSize; // Scan for codes that have been used as a prefix. - for (int i = CONTROL_CODE + 1; i <= MAX_CODE; i++) + for (var i = CONTROL_CODE + 1; i <= MAX_CODE; i++) { if (codeTab[i].prefixCode != INVALID_CODE) { @@ -56,7 +56,7 @@ namespace SharpCompress.Compressors.Shrink // Clear "non-prefix" codes in the table; populate the code queue. codeQueueSize = 0; - for (int i = CONTROL_CODE + 1; i <= MAX_CODE; i++) + for (var i = CONTROL_CODE + 1; i <= MAX_CODE; i++) { if (!isPrefix[i]) { @@ -240,8 +240,8 @@ namespace SharpCompress.Compressors.Shrink out int dstUsed ) { - CodeTabEntry[] codeTab = new CodeTabEntry[HASHTAB_SIZE]; - CodeQueue queue = new CodeQueue(); + var codeTab = new CodeTabEntry[HASHTAB_SIZE]; + var queue = new CodeQueue(); var stream = new BitStream(src, srcLen); int codeSize, dstPos, @@ -323,7 +323,7 @@ namespace SharpCompress.Compressors.Shrink } // Output the string represented by the current code. - UnshrnkStatus status = OutputCode( + var status = OutputCode( currCode, dst, dstPos, @@ -343,7 +343,7 @@ namespace SharpCompress.Compressors.Shrink // Verify that the output matches walking the prefixes. var c = currCode; - for (int i = 0; i < len; i++) + for (var i = 0; i < len; i++) { // assert(codeTab[c].len == len - i); //assert(codeTab[c].extByte == dst[dstPos + len - i - 1]); @@ -422,7 +422,7 @@ namespace SharpCompress.Compressors.Shrink private static ushort CodeQueueRemoveNext(ref CodeQueue q) { - ushort code = CodeQueueNext(ref q); + var code = CodeQueueNext(ref q); if (code != INVALID_CODE) { q.nextIdx++; diff --git a/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs b/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs index 52bba1ad..65b2eb37 100644 --- a/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs +++ b/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs @@ -55,10 +55,10 @@ internal class ShrinkStream : Stream { return 0; } - byte[] src = new byte[_compressedSize]; + var src = new byte[_compressedSize]; inStream.Read(src, offset, (int)_compressedSize); - int srcUsed = 0; - int dstUsed = 0; + var srcUsed = 0; + var dstUsed = 0; HwUnshrink.Unshrink( src, @@ -70,7 +70,7 @@ internal class ShrinkStream : Stream ); _outBytesCount = _byteOut.Length; - for (int index = 0; index < _outBytesCount; ++index) + for (var index = 0; index < _outBytesCount; ++index) { buffer[offset + index] = _byteOut[index]; } diff --git a/src/SharpCompress/IO/DataDescriptorStream.cs b/src/SharpCompress/IO/DataDescriptorStream.cs index b4af4b53..45708338 100644 --- a/src/SharpCompress/IO/DataDescriptorStream.cs +++ b/src/SharpCompress/IO/DataDescriptorStream.cs @@ -88,9 +88,9 @@ public class DataDescriptorStream : Stream return 0; } - int read = _stream.Read(buffer, offset, count); + var read = _stream.Read(buffer, offset, count); - for (int i = 0; i < read; i++) + for (var i = 0; i < read; i++) { if (buffer[offset + i] == DataDescriptorMarker[_search_position]) { diff --git a/src/SharpCompress/Readers/Tar/TarReader.cs b/src/SharpCompress/Readers/Tar/TarReader.cs index 34f337a6..d029376c 100644 --- a/src/SharpCompress/Readers/Tar/TarReader.cs +++ b/src/SharpCompress/Readers/Tar/TarReader.cs @@ -71,12 +71,12 @@ public class TarReader : AbstractReader { stream.CheckNotNull(nameof(stream)); options = options ?? new ReaderOptions(); - RewindableStream rewindableStream = new RewindableStream(stream); + var rewindableStream = new RewindableStream(stream); rewindableStream.StartRecording(); if (GZipArchive.IsGZipFile(rewindableStream)) { rewindableStream.Rewind(false); - GZipStream testStream = new GZipStream(rewindableStream, CompressionMode.Decompress); + var testStream = new GZipStream(rewindableStream, CompressionMode.Decompress); if (TarArchive.IsTarFile(testStream)) { rewindableStream.Rewind(true); @@ -89,11 +89,7 @@ public class TarReader : AbstractReader if (BZip2Stream.IsBZip2(rewindableStream)) { rewindableStream.Rewind(false); - BZip2Stream testStream = new BZip2Stream( - rewindableStream, - CompressionMode.Decompress, - false - ); + var testStream = new BZip2Stream(rewindableStream, CompressionMode.Decompress, false); if (TarArchive.IsTarFile(testStream)) { rewindableStream.Rewind(true); @@ -106,7 +102,7 @@ public class TarReader : AbstractReader if (LZipStream.IsLZipFile(rewindableStream)) { rewindableStream.Rewind(false); - LZipStream testStream = new LZipStream(rewindableStream, CompressionMode.Decompress); + var testStream = new LZipStream(rewindableStream, CompressionMode.Decompress); if (TarArchive.IsTarFile(testStream)) { rewindableStream.Rewind(true); diff --git a/tests/SharpCompress.Test/ArchiveTests.cs b/tests/SharpCompress.Test/ArchiveTests.cs index f4e92b15..dc0aa979 100644 --- a/tests/SharpCompress.Test/ArchiveTests.cs +++ b/tests/SharpCompress.Test/ArchiveTests.cs @@ -297,8 +297,8 @@ public class ArchiveTests : ReaderTests memory.Position = 0; - for (int y = 0; y < 9; y++) - for (int x = 0; x < 256; x++) + for (var y = 0; y < 9; y++) + for (var x = 0; x < 256; x++) { Assert.Equal(x, memory.ReadByte()); } diff --git a/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs b/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs index 46d1a3d3..ea002d62 100644 --- a/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs +++ b/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs @@ -534,13 +534,9 @@ public class LzmaStreamTests [Fact] public void TestLzmaStreamEncodingWritesData() { - using MemoryStream inputStream = new MemoryStream(lzmaResultData); + using var inputStream = new MemoryStream(lzmaResultData); using MemoryStream outputStream = new(); - using LzmaStream lzmaStream = new LzmaStream( - LzmaEncoderProperties.Default, - false, - outputStream - ); + using var lzmaStream = new LzmaStream(LzmaEncoderProperties.Default, false, outputStream); inputStream.CopyTo(lzmaStream); lzmaStream.Close(); Assert.NotEqual(0, outputStream.Length); @@ -551,11 +547,7 @@ public class LzmaStreamTests { var input = new MemoryStream(lzmaResultData); var compressed = new MemoryStream(); - LzmaStream lzmaEncodingStream = new LzmaStream( - LzmaEncoderProperties.Default, - false, - compressed - ); + var lzmaEncodingStream = new LzmaStream(LzmaEncoderProperties.Default, false, compressed); input.CopyTo(lzmaEncodingStream); lzmaEncodingStream.Close(); compressed.Position = 0; @@ -580,7 +572,7 @@ public class LzmaStreamTests long decompressedSize ) { - LzmaStream lzmaStream = new LzmaStream( + var lzmaStream = new LzmaStream( properties, compressedStream, compressedSize, @@ -589,12 +581,12 @@ public class LzmaStreamTests false ); - byte[] buffer = ArrayPool.Shared.Rent(1024); + var buffer = ArrayPool.Shared.Rent(1024); long totalRead = 0; while (totalRead < decompressedSize) { - int toRead = (int)Math.Min(buffer.Length, decompressedSize - totalRead); - int read = lzmaStream.Read(buffer, 0, toRead); + var toRead = (int)Math.Min(buffer.Length, decompressedSize - totalRead); + var read = lzmaStream.Read(buffer, 0, toRead); if (read > 0) { decompressedStream.Write(buffer, 0, read); diff --git a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs index c39bbbd8..1ee6b783 100644 --- a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs +++ b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs @@ -26,10 +26,10 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_FileName_Exactly_100_Characters() { - string archive = "Tar_FileName_Exactly_100_Characters.tar"; + var archive = "Tar_FileName_Exactly_100_Characters.tar"; // create the 100 char filename - string filename = + var filename = "filename_with_exactly_100_characters_______________________________________________________________X"; // Step 1: create a tar file containing a file with the test name @@ -37,7 +37,7 @@ public class TarArchiveTests : ArchiveTests using (var writer = WriterFactory.Open(stream, ArchiveType.Tar, CompressionType.None)) using (Stream inputStream = new MemoryStream()) { - StreamWriter sw = new StreamWriter(inputStream); + var sw = new StreamWriter(inputStream); sw.Write("dummy filecontent"); sw.Flush(); @@ -46,7 +46,7 @@ public class TarArchiveTests : ArchiveTests } // Step 2: check if the written tar file can be read correctly - string unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive); + var unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive); using (var archive2 = TarArchive.Open(unmodified)) { Assert.Equal(1, archive2.Entries.Count); @@ -65,7 +65,7 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_NonUstarArchiveWithLongNameDoesNotSkipEntriesAfterTheLongOne() { - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar"); using var archive = TarArchive.Open(unmodified); Assert.Equal(5, archive.Entries.Count); Assert.Contains("very long filename/", archive.Entries.Select(entry => entry.Key)); @@ -81,11 +81,11 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_VeryLongFilepathReadback() { - string archive = "Tar_VeryLongFilepathReadback.tar"; + var archive = "Tar_VeryLongFilepathReadback.tar"; // create a very long filename - string longFilename = ""; - for (int i = 0; i < 600; i = longFilename.Length) + var longFilename = ""; + for (var i = 0; i < 600; i = longFilename.Length) { longFilename += i.ToString("D10") + "-"; } @@ -97,7 +97,7 @@ public class TarArchiveTests : ArchiveTests using (var writer = WriterFactory.Open(stream, ArchiveType.Tar, CompressionType.None)) using (Stream inputStream = new MemoryStream()) { - StreamWriter sw = new StreamWriter(inputStream); + var sw = new StreamWriter(inputStream); sw.Write("dummy filecontent"); sw.Flush(); @@ -106,7 +106,7 @@ public class TarArchiveTests : ArchiveTests } // Step 2: check if the written tar file can be read correctly - string unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive); + var unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive); using (var archive2 = TarArchive.Open(unmodified)) { Assert.Equal(1, archive2.Entries.Count); @@ -125,7 +125,7 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_UstarArchivePathReadLongName() { - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "ustar with long names.tar"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "ustar with long names.tar"); using var archive = TarArchive.Open(unmodified); Assert.Equal(6, archive.Entries.Count); Assert.Contains("Directory/", archive.Entries.Select(entry => entry.Key)); @@ -154,8 +154,8 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_Create_New() { - string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.tar"); - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar"); + var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.tar"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar"); // var aropt = new Ar @@ -172,10 +172,10 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_Random_Write_Add() { - string jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg", "test.jpg"); - string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar"); - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.mod.tar"); - string modified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar"); + var jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg", "test.jpg"); + var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.mod.tar"); + var modified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar"); using (var archive = TarArchive.Open(unmodified)) { @@ -188,9 +188,9 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_Random_Write_Remove() { - string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar"); - string modified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.mod.tar"); - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar"); + var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar"); + var modified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.mod.tar"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar"); using (var archive = TarArchive.Open(unmodified)) { @@ -206,18 +206,18 @@ public class TarArchiveTests : ArchiveTests [Fact] public void Tar_Containing_Rar_Archive() { - string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsRar.tar"); + var archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsRar.tar"); using Stream stream = File.OpenRead(archiveFullPath); - using IArchive archive = ArchiveFactory.Open(stream); + using var archive = ArchiveFactory.Open(stream); Assert.True(archive.Type == ArchiveType.Tar); } [Fact] public void Tar_Empty_Archive() { - string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.Empty.tar"); + var archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.Empty.tar"); using Stream stream = File.OpenRead(archiveFullPath); - using IArchive archive = ArchiveFactory.Open(stream); + using var archive = ArchiveFactory.Open(stream); Assert.True(archive.Type == ArchiveType.Tar); } diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs index a74f70cd..718b75ed 100644 --- a/tests/SharpCompress.Test/Tar/TarReaderTests.cs +++ b/tests/SharpCompress.Test/Tar/TarReaderTests.cs @@ -22,8 +22,8 @@ public class TarReaderTests : ReaderTests using Stream stream = new ForwardOnlyStream( File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar")) ); - using IReader reader = ReaderFactory.Open(stream); - int x = 0; + using var reader = ReaderFactory.Open(stream); + var x = 0; while (reader.MoveToNextEntry()) { if (!reader.Entry.IsDirectory) @@ -67,18 +67,18 @@ public class TarReaderTests : ReaderTests { Assert.Equal(CompressionType.BZip2, reader.Entry.CompressionType); using var entryStream = reader.OpenEntryStream(); - string file = Path.GetFileName(reader.Entry.Key); - string folder = + var file = Path.GetFileName(reader.Entry.Key); + var folder = Path.GetDirectoryName(reader.Entry.Key) ?? throw new ArgumentNullException(); - string destdir = Path.Combine(SCRATCH_FILES_PATH, folder); + var destdir = Path.Combine(SCRATCH_FILES_PATH, folder); if (!Directory.Exists(destdir)) { Directory.CreateDirectory(destdir); } - string destinationFileName = Path.Combine(destdir, file); + var destinationFileName = Path.Combine(destdir, file); - using FileStream fs = File.OpenWrite(destinationFileName); + using var fs = File.OpenWrite(destinationFileName); entryStream.TransferTo(fs); } } @@ -141,23 +141,23 @@ public class TarReaderTests : ReaderTests [Fact] public void Tar_Containing_Rar_Reader() { - string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsRar.tar"); + var archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsRar.tar"); using Stream stream = File.OpenRead(archiveFullPath); - using IReader reader = ReaderFactory.Open(stream); + using var reader = ReaderFactory.Open(stream); Assert.True(reader.ArchiveType == ArchiveType.Tar); } [Fact] public void Tar_With_TarGz_With_Flushed_EntryStream() { - string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsTarGz.tar"); + var archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsTarGz.tar"); using Stream stream = File.OpenRead(archiveFullPath); - using IReader reader = ReaderFactory.Open(stream); + using var reader = ReaderFactory.Open(stream); Assert.True(reader.MoveToNextEntry()); Assert.Equal("inner.tar.gz", reader.Entry.Key); using var entryStream = reader.OpenEntryStream(); - using FlushOnDisposeStream flushingStream = new FlushOnDisposeStream(entryStream); + using var flushingStream = new FlushOnDisposeStream(entryStream); // Extract inner.tar.gz using var innerReader = ReaderFactory.Open(flushingStream); @@ -168,9 +168,9 @@ public class TarReaderTests : ReaderTests [Fact] public void Tar_Broken_Stream() { - string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"); + var archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"); using Stream stream = File.OpenRead(archiveFullPath); - using IReader reader = ReaderFactory.Open(stream); + using var reader = ReaderFactory.Open(stream); var memoryStream = new MemoryStream(); Action action = () => reader.MoveToNextEntry(); diff --git a/tests/SharpCompress.Test/Xz/XZHeaderTests.cs b/tests/SharpCompress.Test/Xz/XZHeaderTests.cs index 318056d2..7ce7dd48 100644 --- a/tests/SharpCompress.Test/Xz/XZHeaderTests.cs +++ b/tests/SharpCompress.Test/Xz/XZHeaderTests.cs @@ -12,7 +12,7 @@ public class XZHeaderTests : XZTestsBase var bytes = (byte[])Compressed.Clone(); bytes[3]++; using Stream badMagicNumberStream = new MemoryStream(bytes); - BinaryReader br = new BinaryReader(badMagicNumberStream); + var br = new BinaryReader(badMagicNumberStream); var header = new XZHeader(br); var ex = Assert.Throws(() => { @@ -27,7 +27,7 @@ public class XZHeaderTests : XZTestsBase var bytes = (byte[])Compressed.Clone(); bytes[8]++; using Stream badCrcStream = new MemoryStream(bytes); - BinaryReader br = new BinaryReader(badCrcStream); + var br = new BinaryReader(badCrcStream); var header = new XZHeader(br); var ex = Assert.Throws(() => { @@ -41,11 +41,11 @@ public class XZHeaderTests : XZTestsBase { var bytes = (byte[])Compressed.Clone(); byte[] streamFlags = { 0x00, 0xF4 }; - byte[] crc = Crc32.Compute(streamFlags).ToLittleEndianBytes(); + var crc = Crc32.Compute(streamFlags).ToLittleEndianBytes(); streamFlags.CopyTo(bytes, 6); crc.CopyTo(bytes, 8); using Stream badFlagStream = new MemoryStream(bytes); - BinaryReader br = new BinaryReader(badFlagStream); + var br = new BinaryReader(badFlagStream); var header = new XZHeader(br); var ex = Assert.Throws(() => { @@ -57,7 +57,7 @@ public class XZHeaderTests : XZTestsBase [Fact] public void ProcessesBlockCheckType() { - BinaryReader br = new BinaryReader(CompressedStream); + var br = new BinaryReader(CompressedStream); var header = new XZHeader(br); header.Process(); Assert.Equal(CheckType.CRC64, header.BlockCheckType); @@ -66,7 +66,7 @@ public class XZHeaderTests : XZTestsBase [Fact] public void CanCalculateBlockCheckSize() { - BinaryReader br = new BinaryReader(CompressedStream); + var br = new BinaryReader(CompressedStream); var header = new XZHeader(br); header.Process(); Assert.Equal(8, header.BlockCheckSize); diff --git a/tests/SharpCompress.Test/Xz/XZIndexTests.cs b/tests/SharpCompress.Test/Xz/XZIndexTests.cs index 2d024e8d..f87f7b9b 100644 --- a/tests/SharpCompress.Test/Xz/XZIndexTests.cs +++ b/tests/SharpCompress.Test/Xz/XZIndexTests.cs @@ -16,7 +16,7 @@ public class XZIndexTests : XZTestsBase public void RecordsStreamStartOnInit() { using Stream badStream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 }); - BinaryReader br = new BinaryReader(badStream); + var br = new BinaryReader(badStream); var index = new XZIndex(br, false); Assert.Equal(0, index.StreamStartPosition); } @@ -25,7 +25,7 @@ public class XZIndexTests : XZTestsBase public void ThrowsIfHasNoIndexMarker() { using Stream badStream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 }); - BinaryReader br = new BinaryReader(badStream); + var br = new BinaryReader(badStream); var index = new XZIndex(br, false); Assert.Throws(() => index.Process()); } @@ -33,7 +33,7 @@ public class XZIndexTests : XZTestsBase [Fact] public void ReadsNoRecord() { - BinaryReader br = new BinaryReader(CompressedEmptyStream); + var br = new BinaryReader(CompressedEmptyStream); var index = new XZIndex(br, false); index.Process(); Assert.Equal((ulong)0, index.NumberOfRecords); @@ -42,7 +42,7 @@ public class XZIndexTests : XZTestsBase [Fact] public void ReadsOneRecord() { - BinaryReader br = new BinaryReader(CompressedStream); + var br = new BinaryReader(CompressedStream); var index = new XZIndex(br, false); index.Process(); Assert.Equal((ulong)1, index.NumberOfRecords); @@ -51,7 +51,7 @@ public class XZIndexTests : XZTestsBase [Fact] public void ReadsMultipleRecords() { - BinaryReader br = new BinaryReader(CompressedIndexedStream); + var br = new BinaryReader(CompressedIndexedStream); var index = new XZIndex(br, false); index.Process(); Assert.Equal((ulong)2, index.NumberOfRecords); @@ -60,7 +60,7 @@ public class XZIndexTests : XZTestsBase [Fact] public void ReadsFirstRecord() { - BinaryReader br = new BinaryReader(CompressedStream); + var br = new BinaryReader(CompressedStream); var index = new XZIndex(br, false); index.Process(); Assert.Equal((ulong)OriginalBytes.Length, index.Records[0].UncompressedSize); @@ -88,7 +88,7 @@ public class XZIndexTests : XZTestsBase 0xFF } ); - BinaryReader br = new BinaryReader(badStream); + var br = new BinaryReader(badStream); var index = new XZIndex(br, false); index.Process(); Assert.Equal(0L, badStream.Position % 4L); diff --git a/tests/SharpCompress.Test/Xz/XZStreamTests.cs b/tests/SharpCompress.Test/Xz/XZStreamTests.cs index 7bff0ff5..dfbcf0ca 100644 --- a/tests/SharpCompress.Test/Xz/XZStreamTests.cs +++ b/tests/SharpCompress.Test/Xz/XZStreamTests.cs @@ -9,27 +9,27 @@ public class XZStreamTests : XZTestsBase [Fact] public void CanReadEmptyStream() { - XZStream xz = new XZStream(CompressedEmptyStream); + var xz = new XZStream(CompressedEmptyStream); using var sr = new StreamReader(xz); - string uncompressed = sr.ReadToEnd(); + var uncompressed = sr.ReadToEnd(); Assert.Equal(OriginalEmpty, uncompressed); } [Fact] public void CanReadStream() { - XZStream xz = new XZStream(CompressedStream); + var xz = new XZStream(CompressedStream); using var sr = new StreamReader(xz); - string uncompressed = sr.ReadToEnd(); + var uncompressed = sr.ReadToEnd(); Assert.Equal(Original, uncompressed); } [Fact] public void CanReadIndexedStream() { - XZStream xz = new XZStream(CompressedIndexedStream); + var xz = new XZStream(CompressedIndexedStream); using var sr = new StreamReader(xz); - string uncompressed = sr.ReadToEnd(); + var uncompressed = sr.ReadToEnd(); Assert.Equal(OriginalIndexed, uncompressed); } } diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs index fee99aaf..1948b26a 100644 --- a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs @@ -186,9 +186,9 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Random_Write_Remove() { - string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip"); - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); - string modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip"); + var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); + var modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip"); using (var archive = ZipArchive.Open(unmodified)) { @@ -208,10 +208,10 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Random_Write_Add() { - string jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg", "test.jpg"); - string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip"); - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip"); - string modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod2.zip"); + var jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg", "test.jpg"); + var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip"); + var modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod2.zip"); using (var archive = ZipArchive.Open(unmodified)) { @@ -228,12 +228,12 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Save_Twice() { - string scratchPath1 = Path.Combine(SCRATCH_FILES_PATH, "a.zip"); - string scratchPath2 = Path.Combine(SCRATCH_FILES_PATH, "b.zip"); + var scratchPath1 = Path.Combine(SCRATCH_FILES_PATH, "a.zip"); + var scratchPath2 = Path.Combine(SCRATCH_FILES_PATH, "b.zip"); using (var arc = ZipArchive.Create()) { - string str = "test.txt"; + var str = "test.txt"; var source = new MemoryStream(Encoding.UTF8.GetBytes(str)); arc.AddEntry("test.txt", source, true, source.Length); arc.SaveTo(scratchPath1, CompressionType.Deflate); @@ -246,9 +246,9 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Removal_Poly() { - string scratchPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); + var scratchPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); - using ZipArchive vfs = (ZipArchive)ArchiveFactory.Open(scratchPath); + using var vfs = (ZipArchive)ArchiveFactory.Open(scratchPath); var e = vfs.Entries.First(v => v.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase)); vfs.RemoveEntry(e); Assert.Null( @@ -274,8 +274,8 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Create_Same_Stream() { - string scratchPath1 = Path.Combine(SCRATCH_FILES_PATH, "a.zip"); - string scratchPath2 = Path.Combine(SCRATCH_FILES_PATH, "b.zip"); + var scratchPath1 = Path.Combine(SCRATCH_FILES_PATH, "a.zip"); + var scratchPath2 = Path.Combine(SCRATCH_FILES_PATH, "b.zip"); using (var arc = ZipArchive.Create()) { @@ -320,8 +320,8 @@ public class ZipArchiveTests : ArchiveTests } File.Copy(file, newFileName); } - string scratchPath = Path.Combine(SCRATCH2_FILES_PATH, "Zip.deflate.noEmptyDirs.zip"); - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); + var scratchPath = Path.Combine(SCRATCH2_FILES_PATH, "Zip.deflate.noEmptyDirs.zip"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); using (var archive = ZipArchive.Create()) { @@ -387,7 +387,7 @@ public class ZipArchiveTests : ArchiveTests } File.Copy(file, newFileName); } - string scratchPath = Path.Combine(SCRATCH2_FILES_PATH, "Zip.deflate.noEmptyDirs.zip"); + var scratchPath = Path.Combine(SCRATCH2_FILES_PATH, "Zip.deflate.noEmptyDirs.zip"); using (var archive = ZipArchive.Create()) { @@ -453,7 +453,7 @@ public class ZipArchiveTests : ArchiveTests var isComplete = reader.IsComplete; Assert.Equal(1, reader.Volumes.Count); - string expectedComment = + var expectedComment = "Encoding:utf-8 || Compression:Deflate levelDefault || Encrypt:None || ZIP64:Always\r\nCreated at 2017-Jan-23 14:10:43 || DotNetZip Tool v1.9.1.8\r\nTest zip64 archive"; Assert.Equal(expectedComment, reader.Volumes.First().Comment); } @@ -482,10 +482,10 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Random_Entry_Access() { - string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); + var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); - ZipArchive a = ZipArchive.Open(unmodified); - int count = 0; + var a = ZipArchive.Open(unmodified); + var count = 0; foreach (var e in a.Entries) { count++; @@ -496,7 +496,7 @@ public class ZipArchiveTests : ArchiveTests a.Dispose(); a = ZipArchive.Open(unmodified); - int count2 = 0; + var count2 = 0; foreach (var e in a.Entries) { @@ -512,7 +512,7 @@ public class ZipArchiveTests : ArchiveTests } } - int count3 = 0; + var count3 = 0; foreach (var e in a.Entries) { count3++; @@ -524,20 +524,20 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Deflate_PKWear_Multipy_Entry_Access() { - string zipFile = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.pkware.zip"); + var zipFile = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.pkware.zip"); - using FileStream fileStream = File.Open(zipFile, FileMode.Open); - using IArchive archive = ArchiveFactory.Open( + using var fileStream = File.Open(zipFile, FileMode.Open); + using var archive = ArchiveFactory.Open( fileStream, new ReaderOptions { Password = "12345678" } ); var entries = archive.Entries.Where(entry => !entry.IsDirectory); - foreach (IArchiveEntry entry in entries) + foreach (var entry in entries) { for (var i = 0; i < 100; i++) { using var memoryStream = new MemoryStream(); - using Stream entryStream = entry.OpenEntryStream(); + using var entryStream = entry.OpenEntryStream(); entryStream.CopyTo(memoryStream); } } @@ -549,7 +549,7 @@ public class ZipArchiveTests : ArchiveTests //windows only because of the paths Skip.IfNot(Environment.OSVersion.Platform == PlatformID.Win32NT); - string zipFile = Path.Combine(TEST_ARCHIVES_PATH, "Zip.Evil.zip"); + var zipFile = Path.Combine(TEST_ARCHIVES_PATH, "Zip.Evil.zip"); Assert.ThrowsAny(() => { @@ -574,9 +574,7 @@ public class ZipArchiveTests : ArchiveTests { MemoryStream stream = new NonSeekableMemoryStream(); - using ( - IWriter zipWriter = WriterFactory.Open(stream, ArchiveType.Zip, CompressionType.Deflate) - ) + using (var zipWriter = WriterFactory.Open(stream, ArchiveType.Zip, CompressionType.Deflate)) { zipWriter.Write("foo.txt", new MemoryStream(Array.Empty())); zipWriter.Write("foo2.txt", new MemoryStream(new byte[10])); @@ -590,10 +588,10 @@ public class ZipArchiveTests : ArchiveTests foreach (var entry in zipArchive.Entries) { using var entryStream = entry.OpenEntryStream(); - MemoryStream tempStream = new MemoryStream(); + var tempStream = new MemoryStream(); const int bufSize = 0x1000; - byte[] buf = new byte[bufSize]; - int bytesRead = 0; + var buf = new byte[bufSize]; + var bytesRead = 0; while ((bytesRead = entryStream.Read(buf, 0, bufSize)) > 0) { tempStream.Write(buf, 0, bytesRead); @@ -605,9 +603,9 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_BadLocalExtra_Read() { - string zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.badlocalextra.zip"); + var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.badlocalextra.zip"); - using ZipArchive za = ZipArchive.Open(zipPath); + using var za = ZipArchive.Open(zipPath); var ex = Record.Exception(() => { var firstEntry = za.Entries.First(x => x.Key == "first.txt"); @@ -625,9 +623,9 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_NoCompression_DataDescriptors_Read() { - string zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.none.datadescriptors.zip"); + var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.none.datadescriptors.zip"); - using ZipArchive za = ZipArchive.Open(zipPath); + using var za = ZipArchive.Open(zipPath); var firstEntry = za.Entries.First(x => x.Key == "first.txt"); var buffer = new byte[4096]; @@ -664,9 +662,9 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_LongComment_Read() { - string zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.LongComment.zip"); + var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.LongComment.zip"); - using ZipArchive za = ZipArchive.Open(zipPath); + using var za = ZipArchive.Open(zipPath); var count = za.Entries.Count; Assert.Equal(1, count); } @@ -674,9 +672,9 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Zip64_CompressedSizeExtraOnly_Read() { - string zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.zip64.compressedonly.zip"); + var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.zip64.compressedonly.zip"); - using ZipArchive za = ZipArchive.Open(zipPath); + using var za = ZipArchive.Open(zipPath); var firstEntry = za.Entries.First(x => x.Key == "test/test.txt"); using var memoryStream = new MemoryStream(); @@ -688,11 +686,11 @@ public class ZipArchiveTests : ArchiveTests [Fact] public void Zip_Uncompressed_Read_All() { - string zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip"); + var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip"); using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read); - IArchive archive = ArchiveFactory.Open(stream); - IReader reader = archive.ExtractAllEntries(); - int entries = 0; + var archive = ArchiveFactory.Open(stream); + var reader = archive.ExtractAllEntries(); + var entries = 0; while (reader.MoveToNextEntry()) { using (var entryStream = reader.OpenEntryStream()) @@ -719,9 +717,9 @@ public class ZipArchiveTests : ArchiveTests }; var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip"); using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read); - IArchive archive = ArchiveFactory.Open(stream); - IReader reader = archive.ExtractAllEntries(); - int x = 0; + var archive = ArchiveFactory.Open(stream); + var reader = archive.ExtractAllEntries(); + var x = 0; while (reader.MoveToNextEntry()) { Assert.Equal(keys[x], reader.Entry.Key); @@ -737,7 +735,7 @@ public class ZipArchiveTests : ArchiveTests var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.UnicodePathExtra.zip"); using (var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read)) { - IArchive archive = ArchiveFactory.Open( + var archive = ArchiveFactory.Open( stream, new ReaderOptions { @@ -747,13 +745,13 @@ public class ZipArchiveTests : ArchiveTests } } ); - IReader reader = archive.ExtractAllEntries(); + var reader = archive.ExtractAllEntries(); reader.MoveToNextEntry(); Assert.Equal("궖귛궖귙귪궖귗귪궖귙_wav.frq", reader.Entry.Key); } using (var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read)) { - IArchive archive = ArchiveFactory.Open( + var archive = ArchiveFactory.Open( stream, new ReaderOptions { @@ -763,7 +761,7 @@ public class ZipArchiveTests : ArchiveTests } } ); - IReader reader = archive.ExtractAllEntries(); + var reader = archive.ExtractAllEntries(); reader.MoveToNextEntry(); Assert.Equal("きょきゅんきゃんきゅ_wav.frq", reader.Entry.Key); }