Update for 0.25.1

Attempt Windows reference fix

.github/workflows/dotnetcore.yml

@@ -12,6 +12,6 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.100
+        dotnet-version: 3.1.202
     - name: Run the Cake script
       uses: ecampidoglio/cake-action@master

SharpCompress.sln.DotSettings

@@ -126,4 +126,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=6af8f80e_002D9fdd_002D4223_002D8e02_002D473db916f9b2/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="All tests from Solution" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
+  &lt;Solution /&gt;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>

src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs

@@ -129,12 +129,12 @@ namespace SharpCompress.Archives.SevenZip
             }
         }
 
-        private static readonly byte[] SIGNATURE = {(byte)'7', (byte)'z', 0xBC, 0xAF, 0x27, 0x1C};
+        private static ReadOnlySpan<byte> SIGNATURE => new byte[] {(byte)'7', (byte)'z', 0xBC, 0xAF, 0x27, 0x1C};
 
         private static bool SignatureMatch(Stream stream)
         {
             BinaryReader reader = new BinaryReader(stream);
-            byte[] signatureBytes = reader.ReadBytes(6);
+            ReadOnlySpan<byte> signatureBytes = reader.ReadBytes(6);
             return signatureBytes.SequenceEqual(SIGNATURE);
         }
 

src/SharpCompress/Common/ArchiveEncoding.cs

@@ -32,10 +32,12 @@ namespace SharpCompress.Common
             Password = Encoding.GetEncoding(437);
         }
 
+#if NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1
         static ArchiveEncoding()
         {
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
+#endif
 
         public string Decode(byte[] bytes)
         {

src/SharpCompress/Common/ExtractionOptions.cs

@@ -1,4 +1,6 @@
-namespace SharpCompress.Common
+using System;
+
+namespace SharpCompress.Common
 {
     public class ExtractionOptions
     {
@@ -29,6 +31,10 @@
         /// </summary>
         public delegate void SymbolicLinkWriterDelegate(string sourcePath, string targetPath);
 
-        public SymbolicLinkWriterDelegate WriteSymbolicLink;
+        public SymbolicLinkWriterDelegate WriteSymbolicLink =
+            (sourcePath, targetPath) =>
+            {
+                Console.WriteLine($"Could not write symlink {sourcePath} -> {targetPath}, for more information please see https://github.com/dotnet/runtime/issues/24271");
+            };
     }
 }

src/SharpCompress/Common/GZip/GZipEntry.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 
 namespace SharpCompress.Common.GZip
 {

src/SharpCompress/Common/IEntry.Extensions.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using SharpCompress.Readers;
 
 namespace SharpCompress.Common
 {

src/SharpCompress/Common/Rar/Headers/AVHeader.cs

@@ -7,8 +7,10 @@ namespace SharpCompress.Common.Rar.Headers
         public AvHeader(RarHeader header, RarCrcBinaryReader reader) 
             : base(header, reader, HeaderType.Av) 
         {
-            if (IsRar5) 
+            if (IsRar5)
+            {
                 throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

src/SharpCompress/Common/Rar/Headers/ArchiveHeader.cs

@@ -38,7 +38,11 @@ namespace SharpCompress.Common.Rar.Headers
         private void ReadLocator(MarkingBinaryReader reader) {
             var size = reader.ReadRarVIntUInt16();
             var type = reader.ReadRarVIntUInt16();
-            if (type != 1) throw new InvalidFormatException("expected locator record");
+            if (type != 1)
+            {
+                throw new InvalidFormatException("expected locator record");
+            }
+
             var flags = reader.ReadRarVIntUInt16();
             const ushort hasQuickOpenOffset = 0x01;
             const ushort hasRecoveryOffset = 0x02;

src/SharpCompress/Common/Rar/Headers/CommentHeader.cs

@@ -7,7 +7,10 @@ namespace SharpCompress.Common.Rar.Headers
         protected CommentHeader(RarHeader header, RarCrcBinaryReader reader)
             : base(header, reader, HeaderType.Comment) 
         { 
-            if (IsRar5) throw new InvalidFormatException("unexpected rar5 record");
+            if (IsRar5)
+            {
+                throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

src/SharpCompress/Common/Rar/Headers/MarkHeader.cs

@@ -46,19 +46,38 @@ namespace SharpCompress.Common.Rar.Headers
                         if (b == 0x61) 
                         {
                             b = GetByte(stream); start++;
-                            if (b != 0x72) continue;
+                            if (b != 0x72)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x21) continue;
+                            if (b != 0x21)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x1a) continue;
+                            if (b != 0x1a)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x07) continue;
+                            if (b != 0x07)
+                            {
+                                continue;
+                            }
 
                             b = GetByte(stream); start++;
                             if (b == 1) 
                             {
                                 b = GetByte(stream); start++;
-                                if (b != 0) continue;
+                                if (b != 0)
+                                {
+                                    continue;
+                                }
+
                                 return new MarkHeader(true); // Rar5
                             } 
                             else if (b == 0) 
@@ -69,9 +88,17 @@ namespace SharpCompress.Common.Rar.Headers
                         else if (b == 0x45) 
                         {
                             b = GetByte(stream); start++;
-                            if (b != 0x7e) continue;
+                            if (b != 0x7e)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x5e) continue;
+                            if (b != 0x5e)
+                            {
+                                continue;
+                            }
+
                             throw new InvalidFormatException("Rar format version pre-4 is unsupported.");
                         } 
                     } 

src/SharpCompress/Common/Rar/Headers/ProtectHeader.cs

@@ -8,7 +8,10 @@ namespace SharpCompress.Common.Rar.Headers
         public ProtectHeader(RarHeader header, RarCrcBinaryReader reader) 
             : base(header, reader, HeaderType.Protect) 
         {
-            if (IsRar5) throw new InvalidFormatException("unexpected rar5 record");
+            if (IsRar5)
+            {
+                throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using SharpCompress.IO;

src/SharpCompress/Common/Rar/Headers/SignHeader.cs

@@ -7,7 +7,10 @@ namespace SharpCompress.Common.Rar.Headers
         protected SignHeader(RarHeader header, RarCrcBinaryReader reader)
             : base(header, reader, HeaderType.Sign) 
         { 
-            if (IsRar5) throw new InvalidFormatException("unexpected rar5 record");
+            if (IsRar5)
+            {
+                throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

src/SharpCompress/Common/Rar/RarCryptoBinaryReader.cs

@@ -81,7 +81,9 @@ namespace SharpCompress.Common.Rar
                     byte[] cipherText = ReadBytesNoCrc(16);
                     var readBytes = _rijndael.ProcessBlock(cipherText);
                     foreach (var readByte in readBytes)
+                    {
                         _data.Enqueue(readByte);
+                    }
                 }
             }
 

src/SharpCompress/Common/Rar/RarCryptoWrapper.cs

@@ -58,12 +58,15 @@ namespace SharpCompress.Common.Rar
 
                     var readBytes = _rijndael.ProcessBlock(cipherText);
                     foreach (var readByte in readBytes)
+                    {
                         _data.Enqueue(readByte);
-
+                    }
                 }
 
                 for (int i = 0; i < count; i++)
+                {
                     buffer[offset + i] = _data.Dequeue();
+                }
             }
             return count;
         }

src/SharpCompress/Common/SevenZip/SevenZipVolume.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using SharpCompress.Archives;
 using SharpCompress.Readers;
 
 namespace SharpCompress.Common.SevenZip

src/SharpCompress/Common/Tar/Headers/TarHeader.cs

@@ -196,7 +196,7 @@ namespace SharpCompress.Common.Tar.Headers
         {
             name.CopyTo(buffer);
             int i = Math.Min(length, name.Length);
-            buffer.Slice(i, length - i).Fill(0);
+            buffer.Slice(i, length - i).Clear();
         }
 
         private static void WriteStringBytes(string name, byte[] buffer, int offset, int length)

src/SharpCompress/Common/Tar/TarEntry.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using SharpCompress.Common.Tar.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Tar
 {

src/SharpCompress/Common/Tar/TarHeaderFactory.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using SharpCompress.Common.Tar.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Tar
 {

src/SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs

@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace SharpCompress.Common.Zip.Headers
 {

src/SharpCompress/Common/Zip/Headers/IgnoreHeader.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 
 namespace SharpCompress.Common.Zip.Headers
 {

src/SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs

@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace SharpCompress.Common.Zip.Headers
 {

src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndHeader.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 
 namespace SharpCompress.Common.Zip.Headers
 {

src/SharpCompress/Common/Zip/PkwareTraditionalEncryptionData.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.Compressors.Deflate;
 

src/SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Zip
 {
@@ -35,7 +34,9 @@ namespace SharpCompress.Common.Zip
                 stream.Seek(zip64Locator.RelativeOffsetOfTheEndOfDirectoryRecord, SeekOrigin.Begin);
                 uint zip64Signature = reader.ReadUInt32();
                 if (zip64Signature != ZIP64_END_OF_CENTRAL_DIRECTORY)
+                {
                     throw new ArchiveException("Failed to locate the Zip64 Header");
+                }
 
                 var zip64Entry = new Zip64DirectoryEndHeader();
                 zip64Entry.Read(reader);
@@ -55,7 +56,9 @@ namespace SharpCompress.Common.Zip
                 position = stream.Position;
 
                 if (nextHeader == null)
+                {
                     yield break;
+                }
 
                 if (nextHeader is DirectoryEntryHeader entryHeader)
                 {

src/SharpCompress/Common/Zip/StreamingZipHeaderFactory.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Zip
 {

src/SharpCompress/Common/Zip/ZipHeaderFactory.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Linq;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Zip
 {

src/SharpCompress/Compressors/ADC/ADCBase.cs

@@ -211,7 +211,7 @@ namespace SharpCompress.Compressors.ADC
             }
 
             output = new byte[outPosition];
-            Array.Copy(buffer, 0, output, 0, outPosition);
+            Array.Copy(buffer, output, outPosition);
             return position - start;
         }
     }

src/SharpCompress/Compressors/Deflate/GZipStream.cs

@@ -372,17 +372,16 @@ namespace SharpCompress.Compressors.Deflate
                 {
                     return;
                 }
-                if (_fileName.IndexOf("/") != -1)
+                if (_fileName.Contains("/"))
                 {
-                    _fileName = _fileName.Replace("/", "\\");
+                    _fileName = _fileName.Replace('/', '\\');
                 }
                 if (_fileName.EndsWith("\\"))
                 {
                     throw new InvalidOperationException("Illegal filename");
                 }
 
-                var index = _fileName.IndexOf("\\");
-                if (index != -1)
+                if (_fileName.Contains("\\"))
                 {
                     // trim any leading path
                     int length = _fileName.Length;

src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using SharpCompress.Common.Zip;
-using SharpCompress.Compressors.Deflate;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -23,11 +22,19 @@ namespace SharpCompress.Compressors.Deflate64
         public Deflate64Stream(Stream stream, CompressionMode mode)
         {
             if (stream == null)
+            {
                 throw new ArgumentNullException(nameof(stream));
+            }
+
             if (mode != CompressionMode.Decompress)
+            {
                 throw new NotImplementedException("Deflate64: this implementation only supports decompression");
+            }
+
             if (!stream.CanRead)
+            {
                 throw new ArgumentException("Deflate64: input stream is not readable", nameof(stream));
+            }
 
             InitializeInflater(stream, ZipCompressionMethod.Deflate64);
         }
@@ -40,7 +47,9 @@ namespace SharpCompress.Compressors.Deflate64
             Debug.Assert(stream != null);
             Debug.Assert(method == ZipCompressionMethod.Deflate || method == ZipCompressionMethod.Deflate64);
             if (!stream.CanRead)
+            {
                 throw new ArgumentException("Deflate64: input stream is not readable", nameof(stream));
+            }
 
             _inflater = new InflaterManaged(method == ZipCompressionMethod.Deflate64);
 
@@ -152,22 +161,32 @@ namespace SharpCompress.Compressors.Deflate64
         private void ValidateParameters(byte[] array, int offset, int count)
         {
             if (array == null)
+            {
                 throw new ArgumentNullException(nameof(array));
+            }
 
             if (offset < 0)
+            {
                 throw new ArgumentOutOfRangeException(nameof(offset));
+            }
 
             if (count < 0)
+            {
                 throw new ArgumentOutOfRangeException(nameof(count));
+            }
 
             if (array.Length - offset < count)
+            {
                 throw new ArgumentException("Deflate64: invalid offset/count combination");
+            }
         }
 
         private void EnsureNotDisposed()
         {
             if (_stream == null)
+            {
                 ThrowStreamClosedException();
+            }
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
@@ -179,7 +198,9 @@ namespace SharpCompress.Compressors.Deflate64
         private void EnsureDecompressionMode()
         {
             if (_mode != CompressionMode.Decompress)
+            {
                 ThrowCannotReadFromDeflateManagedStreamException();
+            }
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
@@ -191,7 +212,9 @@ namespace SharpCompress.Compressors.Deflate64
         private void EnsureCompressionMode()
         {
             if (_mode != CompressionMode.Compress)
+            {
                 ThrowCannotWriteToDeflateManagedStreamException();
+            }
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
@@ -209,10 +232,14 @@ namespace SharpCompress.Compressors.Deflate64
         private void PurgeBuffers(bool disposing)
         {
             if (!disposing)
+            {
                 return;
+            }
 
             if (_stream == null)
+            {
                 return;
+            }
 
             Flush();
         }

src/SharpCompress/Compressors/Deflate64/FastEncoderStatus.cs

@@ -208,7 +208,9 @@ namespace SharpCompress.Compressors.Deflate64
             for (code = 0; code < 16; code++)
             {
                 for (int n = 0; n < (1 << EXTRA_DISTANCE_BITS[code]); n++)
+                {
                     result[dist++] = (byte)code;
+                }
             }
 
             dist >>= 7; // from now on, all distances are divided by 128
@@ -216,7 +218,9 @@ namespace SharpCompress.Compressors.Deflate64
             for (; code < NUM_DIST_BASE_CODES; code++)
             {
                 for (int n = 0; n < (1 << (EXTRA_DISTANCE_BITS[code] - 7)); n++)
+                {
                     result[256 + dist++] = (byte)code;
+                }
             }
 
             return result;

src/SharpCompress/Compressors/Deflate64/HuffmanTree.cs

@@ -82,16 +82,24 @@ namespace SharpCompress.Compressors.Deflate64
         {
             byte[] literalTreeLength = new byte[MAX_LITERAL_TREE_ELEMENTS];
             for (int i = 0; i <= 143; i++)
+            {
                 literalTreeLength[i] = 8;
+            }
 
             for (int i = 144; i <= 255; i++)
+            {
                 literalTreeLength[i] = 9;
+            }
 
             for (int i = 256; i <= 279; i++)
+            {
                 literalTreeLength[i] = 7;
+            }
 
             for (int i = 280; i <= 287; i++)
+            {
                 literalTreeLength[i] = 8;
+            }
 
             return literalTreeLength;
         }
@@ -277,9 +285,14 @@ namespace SharpCompress.Compressors.Deflate64
                 {
                     symbol = -symbol;
                     if ((bitBuffer & mask) == 0)
+                    {
                         symbol = _left[symbol];
+                    }
                     else
+                    {
                         symbol = _right[symbol];
+                    }
+
                     mask <<= 1;
                 } while (symbol < 0);
             }

src/SharpCompress/Compressors/Deflate64/InflaterManaged.cs

@@ -37,7 +37,7 @@ namespace SharpCompress.Compressors.Deflate64
         // const tables used in decoding:
 
         // Extra bits for length code 257 - 285.
-        private static readonly byte[] S_EXTRA_LENGTH_BITS =
+        private static ReadOnlySpan<byte> S_EXTRA_LENGTH_BITS => new byte[]
             { 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,16 };
 
         // The base length for length code 257 - 285.
@@ -51,9 +51,9 @@ namespace SharpCompress.Compressors.Deflate64
             { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,32769,49153 };
 
         // code lengths for code length alphabet is stored in following order
-        private static readonly byte[] S_CODE_ORDER = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
+        private static ReadOnlySpan<byte> S_CODE_ORDER => new byte[] { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
 
-        private static readonly byte[] S_STATIC_DISTANCE_TREE_TABLE =
+        private static ReadOnlySpan<byte> S_STATIC_DISTANCE_TREE_TABLE => new byte[]
         {
             0x00,0x10,0x08,0x18,0x04,0x14,0x0c,0x1c,0x02,0x12,0x0a,0x1a,
             0x06,0x16,0x0e,0x1e,0x01,0x11,0x09,0x19,0x05,0x15,0x0d,0x1d,
@@ -220,7 +220,9 @@ namespace SharpCompress.Compressors.Deflate64
                 // reading bfinal bit
                 // Need 1 bit
                 if (!_input.EnsureBitsAvailable(1))
+                {
                     return false;
+                }
 
                 _bfinal = _input.GetBits(1);
                 _state = InflaterState.ReadingBType;
@@ -718,7 +720,7 @@ namespace SharpCompress.Compressors.Deflate64
             byte[] distanceTreeCodeLength = new byte[HuffmanTree.MAX_DIST_TREE_ELEMENTS];
 
             // Create literal and distance tables
-            Array.Copy(_codeList, 0, literalTreeCodeLength, 0, _literalLengthCodeCount);
+            Array.Copy(_codeList, literalTreeCodeLength, _literalLengthCodeCount);
             Array.Copy(_codeList, _literalLengthCodeCount, distanceTreeCodeLength, 0, _distanceCodeCount);
 
             // Make sure there is an end-of-block code, otherwise how could we ever end?

src/SharpCompress/Compressors/LZMA/AesDecoderStream.cs

@@ -30,7 +30,9 @@ namespace SharpCompress.Compressors.LZMA
             mLimit = limit;
 
             if (((uint) input.Length & 15) != 0)
+            {
                 throw new NotSupportedException("AES decoder does not support padding.");
+            }
 
             int numCyclesPower;
             byte[] salt, seed;
@@ -90,10 +92,14 @@ namespace SharpCompress.Compressors.LZMA
         {
             if (count == 0
                 || mWritten == mLimit)
+            {
                 return 0;
+            }
 
             if (mUnderflow > 0)
+            {
                 return HandleUnderflow(buffer, offset, count);
+            }
 
             // Need at least 16 bytes to proceed.
             if (mEnding - mOffset < 16)
@@ -120,16 +126,22 @@ namespace SharpCompress.Compressors.LZMA
             // Currently this is handled by forcing an underflow if
             // the stream length is not a multiple of the block size.
             if (count > mLimit - mWritten)
+            {
                 count = (int) (mLimit - mWritten);
+            }
 
             // We cannot transform less than 16 bytes into the target buffer,
             // but we also cannot return zero, so we need to handle this.
             // We transform the data locally and use our own buffer as cache.
             if (count < 16)
+            {
                 return HandleUnderflow(buffer, offset, count);
+            }
 
             if (count > mEnding - mOffset)
+            {
                 count = mEnding - mOffset;
+            }
 
             // Otherwise we transform directly into the target buffer.
             int processed = mDecoder.TransformBlock(mBuffer, mOffset, count & ~15, buffer, offset);
@@ -157,24 +169,34 @@ namespace SharpCompress.Compressors.LZMA
             int saltSize = (bt >> 7) & 1;
             int ivSize = (bt >> 6) & 1;
             if (info.Length == 1)
+            {
                 throw new InvalidOperationException();
+            }
 
             byte bt2 = info[1];
             saltSize += (bt2 >> 4);
             ivSize += (bt2 & 15);
             if (info.Length < 2 + saltSize + ivSize)
+            {
                 throw new InvalidOperationException();
+            }
 
             salt = new byte[saltSize];
             for (int i = 0; i < saltSize; i++)
+            {
                 salt[i] = info[i + 2];
+            }
 
             iv = new byte[16];
             for (int i = 0; i < ivSize; i++)
+            {
                 iv[i] = info[i + saltSize + 2];
+            }
 
             if (numCyclesPower > 24)
+            {
                 throw new NotSupportedException();
+            }
         }
 
         private byte[] InitKey(int mNumCyclesPower, byte[] salt, byte[] pass)
@@ -185,9 +207,14 @@ namespace SharpCompress.Compressors.LZMA
 
                 int pos;
                 for (pos = 0; pos < salt.Length; pos++)
+                {
                     key[pos] = salt[pos];
+                }
+
                 for (int i = 0; i < pass.Length && pos < 32; i++)
+                {
                     key[pos++] = pass[i];
+                }
 
                 return key;
             }
@@ -207,8 +234,12 @@ namespace SharpCompress.Compressors.LZMA
                         // 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++)
+                        {
                             if (++counter[i] != 0)
+                            {
                                 break;
+                            }
+                        }
                     }
                     return sha.GetHashAndReset();
                 }
@@ -226,8 +257,12 @@ namespace SharpCompress.Compressors.LZMA
                         // 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++)
+                        {
                             if (++counter[i] != 0)
+                            {
                                 break;
+                            }
+                        }
                     }
 
                     sha.TransformFinalBlock(counter, 0, 0);
@@ -248,7 +283,9 @@ namespace SharpCompress.Compressors.LZMA
             }
 
             if (count > mUnderflow)
+            {
                 count = mUnderflow;
+            }
 
             Buffer.BlockCopy(mBuffer, mOffset, buffer, offset, count);
             mWritten += count;

src/SharpCompress/Compressors/PPMd/H/ModelPPM.cs

@@ -137,7 +137,7 @@ namespace SharpCompress.Compressors.PPMd.H
 
         private void RestartModelRare()
         {
-            new Span<int>(_charMask).Fill(0);
+            new Span<int>(_charMask).Clear();
             SubAlloc.InitSubAllocator();
             _initRl = -(_maxOrder < 12 ? _maxOrder : 12) - 1;
             int addr = SubAlloc.AllocContext();
@@ -228,7 +228,7 @@ namespace SharpCompress.Compressors.PPMd.H
         private void ClearMask()
         {
             _escCount = 1;
-            new Span<int>(_charMask).Fill(0);
+            new Span<int>(_charMask).Clear();
         }
 
         internal bool DecodeInit(IRarUnpack unpackRead, int escChar)

src/SharpCompress/Compressors/PPMd/H/SubAllocator.cs

@@ -360,7 +360,7 @@ namespace SharpCompress.Compressors.PPMd.H
         public virtual void InitSubAllocator()
         {
             int i, k;
-            new Span<byte>(_heap, _freeListPos, SizeOfFreeList()).Fill(0);
+            new Span<byte>(_heap, _freeListPos, SizeOfFreeList()).Clear();
 
             _pText = _heapStart;
 

src/SharpCompress/Compressors/PPMd/I1/Model.cs

@@ -58,7 +58,7 @@ namespace SharpCompress.Compressors.PPMd.I1
             0x6051
         };
 
-        private static readonly byte[] EXPONENTIAL_ESCAPES = {25, 14, 9, 7, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 2};
+        private static ReadOnlySpan<byte> EXPONENTIAL_ESCAPES => new byte[] {25, 14, 9, 7, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 2};
 
         #region Public Methods
 

src/SharpCompress/Compressors/Rar/RarCrcStream.cs

@@ -1,4 +1,3 @@
-using System.IO;
 using SharpCompress.Common;
 using SharpCompress.Common.Rar.Headers;
 

src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs

@@ -729,13 +729,13 @@ namespace SharpCompress.Compressors.Rar.UnpackV1
             if (!solid)
             {
                 tablesRead = false;
-                new Span<int>(oldDist).Fill(0); // memset(oldDist,0,sizeof(OldDist));
+                new Span<int>(oldDist).Clear(); // memset(oldDist,0,sizeof(OldDist));
 
                 oldDistPtr = 0;
                 lastDist = 0;
                 lastLength = 0;
 
-                new Span<byte>(unpOldTable).Fill(0); // memset(UnpOldTable,0,sizeof(UnpOldTable));
+                new Span<byte>(unpOldTable).Clear(); // memset(UnpOldTable,0,sizeof(UnpOldTable));
 
                 unpPtr = 0;
                 wrPtr = 0;
@@ -837,7 +837,7 @@ WriteBorder=Math.Min(MaxWinSize,UNPACK_MAX_WRITE)&MaxWinMask;
 
             if ((bitField & 0x4000) == 0)
             {
-                new Span<byte>(unpOldTable).Fill(0); // memset(UnpOldTable,0,sizeof(UnpOldTable));
+                new Span<byte>(unpOldTable).Clear(); // memset(UnpOldTable,0,sizeof(UnpOldTable));
             }
             AddBits(2);
 
@@ -1109,7 +1109,7 @@ WriteBorder=Math.Min(MaxWinSize,UNPACK_MAX_WRITE)&MaxWinMask;
             oldFilterLengths[FiltPos] = StackFilter.BlockLength;
 
             // memset(StackFilter->Prg.InitR,0,sizeof(StackFilter->Prg.InitR));
-            new Span<int>(StackFilter.Program.InitR).Fill(0);
+            new Span<int>(StackFilter.Program.InitR).Clear();
             StackFilter.Program.InitR[3] = RarVM.VM_GLOBALMEMADDR; // StackFilter->Prg.InitR[3]=VM_GLOBALMEMADDR;
             StackFilter.Program.InitR[4] = StackFilter.BlockLength;
 

src/SharpCompress/Compressors/Rar/UnpackV1/Unpack15.cs

@@ -652,9 +652,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV1
                 ChSetC[I] = ((~I + 1) & 0xff) << 8;
             }
 
-            new Span<int>(NToPl).Fill(0); // memset(NToPl,0,sizeof(NToPl));
-            new Span<int>(NToPlB).Fill(0); // memset(NToPlB,0,sizeof(NToPlB));
-            new Span<int>(NToPlC).Fill(0); // memset(NToPlC,0,sizeof(NToPlC));
+            new Span<int>(NToPl).Clear(); // memset(NToPl,0,sizeof(NToPl));
+            new Span<int>(NToPlB).Clear(); // memset(NToPlB,0,sizeof(NToPlB));
+            new Span<int>(NToPlC).Clear(); // memset(NToPlC,0,sizeof(NToPlC));
             corrHuff(ChSetB, NToPlB);
         }
 
@@ -670,7 +670,7 @@ namespace SharpCompress.Compressors.Rar.UnpackV1
                     // & ~0xff) | I;
                 }
             }
-            new Span<int>(NumToPlace).Fill(0); // memset(NumToPlace,0,sizeof(NToPl));
+            new Span<int>(NumToPlace).Clear(); // memset(NumToPlace,0,sizeof(NToPl));
             for (I = 6; I >= 0; I--)
             {
                 NumToPlace[I] = (7 - I) * 32;

src/SharpCompress/Compressors/Rar/UnpackV1/Unpack20.cs

@@ -38,7 +38,7 @@ namespace SharpCompress.Compressors.Rar.UnpackV1
             56, 64, 80, 96, 112, 128, 160, 192, 224
         };
 
-        private static readonly byte[] LBits =
+        private static ReadOnlySpan<byte> LBits => new byte[]
         {
             0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,
             4, 5, 5, 5, 5
@@ -263,7 +263,7 @@ namespace SharpCompress.Compressors.Rar.UnpackV1
             if (0 == (BitField & 0x4000))
             {
                 // memset(UnpOldTable20,0,sizeof(UnpOldTable20));
-                new Span<byte>(UnpOldTable20).Fill(0);
+                new Span<byte>(UnpOldTable20).Clear();
             }
             AddBits(2);
 
@@ -371,7 +371,7 @@ namespace SharpCompress.Compressors.Rar.UnpackV1
                 AudV[3] = new AudioVariables();
 
                 // memset(UnpOldTable20,0,sizeof(UnpOldTable20));
-                new Span<byte>(UnpOldTable20).Fill(0);
+                new Span<byte>(UnpOldTable20).Clear();
             }
         }
 

src/SharpCompress/Compressors/Rar/UnpackV1/Unpack50.cs

@@ -2,8 +2,6 @@
 using System;
 using System.Collections.Generic;
 using SharpCompress.Compressors.Rar.UnpackV1.Decode;
-using SharpCompress.Compressors.Rar.VM;
-
 using size_t=System.UInt32;
 using UnpackBlockHeader = SharpCompress.Compressors.Rar.UnpackV1;
 
@@ -139,14 +137,18 @@ public bool TablePresent;
             {
                 UnpInitData(Solid);
                 if (!UnpReadBuf())
-                    return;
+                {
+                  return;
+                }
 
                 // Check TablesRead5 to be sure that we read tables at least once
                 // regardless of current block header TablePresent flag.
                 // So we can safefly use these tables below.
                 if (!ReadBlockHeader() || 
                     !ReadTables() || !TablesRead5)
-                    return;
+                {
+                  return;
+                }
             }
 
             while (true)
@@ -169,17 +171,24 @@ public bool TablePresent;
                   break;
                 }
                 if (!ReadBlockHeader() || !ReadTables())
+                {
                   return;
+                }
               }
               if (FileDone || !UnpReadBuf())
+              {
                 break;
+              }
             }
 
             if (((WriteBorder-UnpPtr) & MaxWinMask)<PackDef.MAX_LZ_MATCH+3 && WriteBorder!=UnpPtr)
             {
               UnpWriteBuf();
               if (WrittenFileSize>DestUnpSize)
+              {
                 return;
+              }
+
               if (Suspended)
               {
                 FileExtracted=false;
@@ -243,7 +252,9 @@ public bool TablePresent;
                 {
                   Length++;
                   if (Distance>0x40000)
+                  {
                     Length++;
+                  }
                 }
               }
 
@@ -259,7 +270,10 @@ public bool TablePresent;
             {
               UnpackFilter Filter = new UnpackFilter();
               if (!ReadFilter(Filter) || !AddFilter(Filter))
+              {
                 break;
+              }
+
               continue;
             }
             if (MainSlot==257)
@@ -269,7 +283,10 @@ public bool TablePresent;
 //                  FragWindow.CopyString(LastLength,OldDist[0],UnpPtr,MaxWinMask);
 //                else
                   //CopyString(LastLength,OldDist[0]);
-                  CopyString(LastLength,OldDistN(0));
+              {
+                CopyString(LastLength,OldDistN(0));
+              }
+
               continue;
             }
             if (MainSlot<262)
@@ -281,7 +298,10 @@ public bool TablePresent;
               //for (uint I=DistNum;I>0;I--)
               for (int I=DistNum;I>0;I--)
                 //OldDistN[I]=OldDistN(I-1);
+              {
                 SetOldDistN(I, OldDistN(I-1));
+              }
+
               //OldDistN[0]=Distance;
               SetOldDistN(0, Distance);
 
@@ -316,13 +336,19 @@ public bool TablePresent;
       private bool ReadFilter(UnpackFilter Filter)
         {
           if (!Inp.ExternalBuffer && Inp.InAddr>ReadTop-16)
+          {
             if (!UnpReadBuf())
+            {
               return false;
+            }
+          }
 
           Filter.uBlockStart=ReadFilterData();
           Filter.uBlockLength=ReadFilterData();
           if (Filter.BlockLength>MAX_FILTER_BLOCK_SIZE)
+          {
             Filter.BlockLength=0;
+          }
 
           //Filter.Type=Inp.fgetbits()>>13;
           Filter.Type=(byte)(Inp.fgetbits()>>13);
@@ -344,7 +370,9 @@ public bool TablePresent;
           {
             UnpWriteBuf(); // Write data, apply and flush filters.
             if (Filters.Count>=MAX_UNPACK_FILTERS)
+            {
               InitFilters(); // Still too many filters, prevent excessive memory use.
+            }
           }
 
           // If distance to filter start is that large that due to circular dictionary
@@ -361,7 +389,10 @@ public bool TablePresent;
         {
           int DataSize=ReadTop-Inp.InAddr; // Data left to process.
           if (DataSize<0)
+          {
             return false;
+          }
+
           BlockHeader.BlockSize-=Inp.InAddr-BlockHeader.BlockStart;
           if (Inp.InAddr>MAX_SIZE/2)
           {
@@ -373,21 +404,33 @@ public bool TablePresent;
             // to make it zero.
             if (DataSize>0)
               //memmove(Inp.InBuf,Inp.InBuf+Inp.InAddr,DataSize);
+            {
               Array.Copy(InBuf, inAddr, InBuf, 0, DataSize);
-              // TODO: perf
+            }
+
+            // TODO: perf
               //Buffer.BlockCopy(InBuf, inAddr, InBuf, 0, DataSize);
 
             Inp.InAddr=0;
             ReadTop=DataSize;
           }
           else
+          {
             DataSize=ReadTop;
+          }
+
           int ReadCode=0;
           if (MAX_SIZE!=DataSize)
             //ReadCode=UnpIO->UnpRead(Inp.InBuf+DataSize,BitInput.MAX_SIZE-DataSize);
+          {
             ReadCode = readStream.Read(InBuf, DataSize, MAX_SIZE-DataSize);
+          }
+
           if (ReadCode>0) // Can be also -1.
+          {
             ReadTop+=ReadCode;
+          }
+
           ReadBorder=ReadTop-30;
           BlockHeader.BlockStart=Inp.InAddr;
           if (BlockHeader.BlockSize!=-1) // '-1' means not defined yet.
@@ -674,7 +717,9 @@ public bool TablePresent;
       private void UnpInitData50(bool Solid)
         {
           if (!Solid)
+          {
             TablesRead5=false;
+          }
         }
 
       private bool ReadBlockHeader()
@@ -682,8 +727,13 @@ public bool TablePresent;
           Header.HeaderSize=0;
 
           if (!Inp.ExternalBuffer && Inp.InAddr>ReadTop-7)
+          {
             if (!UnpReadBuf())
+            {
               return false;
+            }
+          }
+
           //Inp.faddbits((8-Inp.InBit)&7);
           Inp.faddbits((uint)((8-Inp.InBit)&7));
   
@@ -693,7 +743,9 @@ public bool TablePresent;
           uint ByteCount=(uint)(((BlockFlags>>3)&3)+1); // Block size byte count.
   
           if (ByteCount==4)
+          {
             return false;
+          }
 
           //Header.HeaderSize=2+ByteCount;
           Header.HeaderSize=(int)(2+ByteCount);
@@ -715,7 +767,9 @@ public bool TablePresent;
           Header.BlockSize=BlockSize;
           byte CheckSum=(byte)(0x5a^BlockFlags^BlockSize^(BlockSize>>8)^(BlockSize>>16));
           if (CheckSum!=SavedCheckSum)
+          {
             return false;
+          }
 
           Header.BlockStart=Inp.InAddr;
           ReadBorder=Math.Min(ReadBorder,Header.BlockStart+Header.BlockSize-1);

src/SharpCompress/Compressors/Rar/UnpackV1/UnpackUtility.cs

@@ -187,7 +187,7 @@ namespace SharpCompress.Compressors.Rar.UnpackV1
             int i;
             long M, N;
 
-            new Span<int>(dec.DecodeNum).Fill(0); // memset(Dec->DecodeNum,0,Size*sizeof(*Dec->DecodeNum));
+            new Span<int>(dec.DecodeNum).Clear(); // memset(Dec->DecodeNum,0,Size*sizeof(*Dec->DecodeNum));
 
             for (i = 0; i < size; i++)
             {

src/SharpCompress/Compressors/Rar/UnpackV2017/BitInput.getbits_cpp.cs

@@ -30,7 +30,9 @@ public BitInput(bool AllocBuffer)
     //memset(InBuf,0,BufSize);
     }
     else
-    InBuf=null;
+    {
+        InBuf=null;
+    }
 }
 
 

src/SharpCompress/Compressors/Rar/UnpackV2017/FragmentedWindow.unpack50frag_cpp.cs

@@ -31,11 +31,13 @@ public FragmentedWindow()
       private void Reset()
 {
   for (uint I=0;I<Mem.Length;I++)
+  {
     if (Mem[I]!=null)
     {
       //free(Mem[I]);
       Mem[I]=null;
     }
+  }
 }
 
 
@@ -60,13 +62,18 @@ public void Init(size_t WinSize)
     {
       NewMem=new byte[Size];
       if (NewMem!=null)
+      {
         break;
+      }
+
       Size-=Size/32;
     }
     if (NewMem==null)
       //throw std::bad_alloc();
+    {
       throw new InvalidOperationException();
-    
+    }
+
     // Clean the window to generate the same output when unpacking corrupt
     // RAR files, which may access to unused areas of sliding dictionary.
     // sharpcompress: don't need this, freshly allocated above
@@ -79,17 +86,27 @@ public void Init(size_t WinSize)
   }
   if (TotalSize<WinSize) // Not found enough free blocks.
     //throw std::bad_alloc();
+  {
     throw new InvalidOperationException();
+  }
 }
 
 
 public byte this[size_t Item] {
 get {
   if (Item<MemSize[0])
+  {
     return Mem[0][Item];
+  }
+
   for (uint I=1;I<MemSize.Length;I++)
+  {
     if (Item<MemSize[I])
+    {
       return Mem[I][Item-MemSize[I-1]];
+    }
+  }
+
   return Mem[0][0]; // Must never happen;
 }
 set {
@@ -98,10 +115,13 @@ set {
     return;
   }                
   for (uint I=1;I<MemSize.Length;I++)
+  {
     if (Item<MemSize[I]) {
       Mem[I][Item-MemSize[I-1]] = value;
       return;
-    }                        
+    }
+  }
+
   Mem[0][0] = value; // Must never happen;
 }
 }
@@ -138,15 +158,22 @@ public void CopyString(uint Length,uint Distance,ref size_t UnpPtr,size_t MaxWin
 public void CopyData(byte[] Dest, size_t destOffset, size_t WinPos,size_t Size)
 {
   for (size_t I=0;I<Size;I++)
+  {
     Dest[destOffset+I]=this[WinPos+I];
+  }
 }
 
 
 public size_t GetBlockSize(size_t StartPos,size_t RequiredSize)
 {
   for (uint I=0;I<MemSize.Length;I++)
+  {
     if (StartPos<MemSize[I])
+    {
       return Math.Min(MemSize[I]-StartPos,RequiredSize);
+    }
+  }
+
   return 0; // Must never be here.
 }
 

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs

@@ -12,7 +12,6 @@ using int64 = System.Int64;
 using System;
 using System.IO;
 using SharpCompress.Common.Rar.Headers;
-using static SharpCompress.Compressors.Rar.UnpackV2017.PackDef;
 
 namespace SharpCompress.Compressors.Rar.UnpackV2017
 {

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.rawint_hpp.cs

@@ -10,10 +10,6 @@ using size_t = System.UInt64;
 using int64 = System.Int64;
 using uint32 = System.UInt32;
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace SharpCompress.Compressors.Rar.UnpackV2017
 {
     internal partial class Unpack

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack15_cpp.cs

@@ -62,7 +62,10 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
     UnpPtr=0;
   }
   else
+  {
     UnpPtr=WrPtr;
+  }
+
   --DestUnpSize;
   if (DestUnpSize>=0)
   {
@@ -75,9 +78,15 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
     UnpPtr&=MaxWinMask;
 
     if (Inp.InAddr>ReadTop-30 && !UnpReadBuf())
+    {
       break;
+    }
+
     if (((WrPtr-UnpPtr) & MaxWinMask)<270 && WrPtr!=UnpPtr)
+    {
       UnpWriteBuf20();
+    }
+
     if (StMode != 0)
     {
       HuffDecode();
@@ -94,9 +103,13 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
     {
       FlagBuf<<=1;
       if (Nlzb > Nhfb)
+      {
         LongLZ();
+      }
       else
+      {
         HuffDecode();
+      }
     }
     else
     {
@@ -110,9 +123,13 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       {
         FlagBuf<<=1;
         if (Nlzb > Nhfb)
+        {
           HuffDecode();
+        }
         else
+        {
           LongLZ();
+        }
       }
       else
       {
@@ -168,15 +185,25 @@ internal static class Unpack15Local {
   if (AvrLn1<37)
   {
     for (Length=0;;Length++)
+    {
       if (((BitField^ShortXor1[Length]) & (~(0xff>>(int)GetShortLen1(Length))))==0)
+      {
         break;
+      }
+    }
+
     Inp.faddbits(GetShortLen1(Length));
   }
   else
   {
     for (Length=0;;Length++)
+    {
       if (((BitField^ShortXor2[Length]) & (~(0xff>>(int)GetShortLen2(Length))))==0)
+      {
         break;
+      }
+    }
+
     Inp.faddbits(GetShortLen2(Length));
   }
 
@@ -210,9 +237,14 @@ internal static class Unpack15Local {
       return;
     }
     if (Distance > 256)
+    {
       Length++;
+    }
+
     if (Distance >= MaxDist3)
+    {
       Length++;
+    }
 
     OldDist[OldDistPtr++]=Distance;
     OldDistPtr = OldDistPtr & 3;
@@ -260,10 +292,14 @@ internal static class Unpack15Local {
 
   uint BitField=Inp.fgetbits();
   if (AvrLn2 >= 122)
+  {
     Length=DecodeNum(BitField,STARTL2,DecL2,PosL2);
+  }
   else
     if (AvrLn2 >= 64)
+    {
       Length=DecodeNum(BitField,STARTL1,DecL1,PosL1);
+    }
     else
       if (BitField < 0x100)
       {
@@ -273,7 +309,10 @@ internal static class Unpack15Local {
       else
       {
         for (Length=0;((BitField<<(int)Length)&0x8000)==0;Length++)
+        {
           ;
+        }
+
         Inp.faddbits(Length+1);
       }
 
@@ -282,12 +321,18 @@ internal static class Unpack15Local {
 
   BitField=Inp.fgetbits();
   if (AvrPlcB > 0x28ff)
+  {
     DistancePlace=DecodeNum(BitField,STARTHF2,DecHf2,PosHf2);
+  }
   else
     if (AvrPlcB > 0x6ff)
+    {
       DistancePlace=DecodeNum(BitField,STARTHF1,DecHf1,PosHf1);
+    }
     else
+    {
       DistancePlace=DecodeNum(BitField,STARTHF0,DecHf0,PosHf0);
+    }
 
   AvrPlcB += DistancePlace;
   AvrPlcB -= AvrPlcB >> 8;
@@ -296,9 +341,13 @@ internal static class Unpack15Local {
     Distance = ChSetB[DistancePlace & 0xff];
     NewDistancePlace = NToPlB[Distance++ & 0xff]++;
     if ((Distance & 0xff) != 0)
+    {
       CorrHuff(ChSetB,NToPlB);
+    }
     else
+    {
       break;
+    }
   }
 
   ChSetB[DistancePlace & 0xff]=ChSetB[NewDistancePlace];
@@ -309,23 +358,39 @@ internal static class Unpack15Local {
 
   OldAvr3=AvrLn3;
   if (Length!=1 && Length!=4)
+  {
     if (Length==0 && Distance <= MaxDist3)
     {
       AvrLn3++;
       AvrLn3 -= AvrLn3 >> 8;
     }
     else
-      if (AvrLn3 > 0)
-        AvrLn3--;
+    if (AvrLn3 > 0)
+    {
+      AvrLn3--;
+    }
+  }
+
   Length+=3;
   if (Distance >= MaxDist3)
+  {
     Length++;
+  }
+
   if (Distance <= 256)
+  {
     Length+=8;
+  }
+
   if (OldAvr3 > 0xb0 || AvrPlc >= 0x2a00 && OldAvr2 < 0x40)
+  {
     MaxDist3=0x7f00;
+  }
   else
+  {
     MaxDist3=0x2001;
+  }
+
   OldDist[OldDistPtr++]=Distance;
   OldDistPtr = OldDistPtr & 3;
   LastLength=Length;
@@ -343,23 +408,37 @@ internal static class Unpack15Local {
   uint BitField=Inp.fgetbits();
 
   if (AvrPlc > 0x75ff)
+  {
     BytePlace=(int)DecodeNum(BitField,STARTHF4,DecHf4,PosHf4);
+  }
   else
     if (AvrPlc > 0x5dff)
+    {
       BytePlace=(int)DecodeNum(BitField,STARTHF3,DecHf3,PosHf3);
+    }
     else
       if (AvrPlc > 0x35ff)
+      {
         BytePlace=(int)DecodeNum(BitField,STARTHF2,DecHf2,PosHf2);
+      }
       else
         if (AvrPlc > 0x0dff)
+        {
           BytePlace=(int)DecodeNum(BitField,STARTHF1,DecHf1,PosHf1);
+        }
         else
+        {
           BytePlace=(int)DecodeNum(BitField,STARTHF0,DecHf0,PosHf0);
+        }
+
   BytePlace&=0xff;
   if (StMode != 0)
   {
     if (BytePlace==0 && BitField > 0xfff)
+    {
       BytePlace=0x100;
+    }
+
     if (--BytePlace==-1)
     {
       BitField=Inp.fgetbits();
@@ -383,7 +462,10 @@ internal static class Unpack15Local {
   }
   else
     if (NumHuf++ >= 16 && FlagsCnt==0)
+    {
       StMode=1;
+    }
+
   AvrPlc += (uint)BytePlace;
   AvrPlc -= AvrPlc >> 8;
   Nhfb+=16;
@@ -401,9 +483,13 @@ internal static class Unpack15Local {
     CurByte=ChSet[BytePlace];
     NewBytePlace=NToPl[CurByte++ & 0xff]++;
     if ((CurByte & 0xff) > 0xa1)
+    {
       CorrHuff(ChSet,NToPl);
+    }
     else
+    {
       break;
+    }
   }
 
   ChSet[BytePlace]=ChSet[NewBytePlace];
@@ -421,7 +507,9 @@ internal static class Unpack15Local {
   // we need to check for value 256 when unpacking in case we unpack
   // a corrupt archive.
   if (FlagsPlace>=ChSetC.Length)
+  {
     return;
+  }
 
   while (true)
   {
@@ -429,7 +517,10 @@ internal static class Unpack15Local {
     FlagBuf=Flags>>8;
     NewFlagsPlace=NToPlC[Flags++ & 0xff]++;
     if ((Flags & 0xff) != 0)
+    {
       break;
+    }
+
     CorrHuff(ChSetC,NToPlC);
   }
 
@@ -462,9 +553,9 @@ internal static class Unpack15Local {
     ChSetA[I]=(ushort)I;
     ChSetC[I]=(ushort)(((~I+1) & 0xff)<<8);
   }
-  new Span<byte>(NToPl).Fill(0);
-  new Span<byte>(NToPlB).Fill(0);
-  new Span<byte>(NToPlC).Fill(0);
+  new Span<byte>(NToPl).Clear();
+  new Span<byte>(NToPlB).Clear();
+  new Span<byte>(NToPlC).Clear();
   CorrHuff(ChSetB,NToPlB);
 }
 
@@ -473,10 +564,15 @@ internal static class Unpack15Local {
   int I,J;
   for (I=7;I>=0;I--)
     for (J=0;J<32;J++)
+    {
       CharSet[J]=(ushort)((CharSet[J] & ~0xff) | I);
-  new Span<byte>(NumToPlace, 0, NToPl.Length).Fill(0);
+    }
+
+  new Span<byte>(NumToPlace, 0, NToPl.Length).Clear();
   for (I=6;I>=0;I--)
+  {
     NumToPlace[I]=(byte)((7-I)*32);
+  }
 }
 
       private void CopyString15(uint Distance,uint Length)
@@ -493,7 +589,10 @@ internal static class Unpack15Local {
 {
   int I;
   for (Num&=0xfff0,I=0;DecTab[I]<=Num;I++)
+  {
     StartPos++;
+  }
+
   Inp.faddbits(StartPos);
   return(((Num-(I != 0 ? DecTab[I-1]:0))>>(int)(16-StartPos))+PosTab[StartPos]);
 }

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs

@@ -40,14 +40,22 @@ internal static class Unpack20Local {
   uint Bits;
 
   if (Suspended)
+  {
     UnpPtr=WrPtr;
+  }
   else
   {
     UnpInitData(Solid);
     if (!UnpReadBuf())
+    {
       return;
+    }
+
     if ((!Solid || !TablesRead2) && !ReadTables20())
+    {
       return;
+    }
+
     --DestUnpSize;
   }
 
@@ -56,13 +64,20 @@ internal static class Unpack20Local {
     UnpPtr&=MaxWinMask;
 
     if (Inp.InAddr>ReadTop-30)
+    {
       if (!UnpReadBuf())
+      {
         break;
+      }
+    }
+
     if (((WrPtr-UnpPtr) & MaxWinMask)<270 && WrPtr!=UnpPtr)
     {
       UnpWriteBuf20();
       if (Suspended)
+      {
         return;
+      }
     }
     if (UnpAudioBlock)
     {
@@ -71,12 +86,18 @@ internal static class Unpack20Local {
       if (AudioNumber==256)
       {
         if (!ReadTables20())
+        {
           break;
+        }
+
         continue;
       }
       Window[UnpPtr++]=DecodeAudio((int)AudioNumber);
       if (++UnpCurChannel==UnpChannels)
+      {
         UnpCurChannel=0;
+      }
+
       --DestUnpSize;
       continue;
     }
@@ -109,7 +130,9 @@ internal static class Unpack20Local {
       {
         Length++;
         if (Distance>=0x40000L)
+        {
           Length++;
+        }
       }
 
       CopyString20(Length,Distance);
@@ -118,7 +141,10 @@ internal static class Unpack20Local {
     if (Number==269)
     {
       if (!ReadTables20())
+      {
         break;
+      }
+
       continue;
     }
     if (Number==256)
@@ -143,7 +169,9 @@ internal static class Unpack20Local {
         {
           Length++;
           if (Distance>=0x40000)
+          {
             Length++;
+          }
         }
       }
       CopyString20(Length,Distance);
@@ -168,7 +196,10 @@ internal static class Unpack20Local {
       private void UnpWriteBuf20()
 {
   if (UnpPtr!=WrPtr)
+  {
     UnpSomeRead=true;
+  }
+
   if (UnpPtr<WrPtr)
   {
     UnpIO_UnpWrite(Window, WrPtr,(uint)(-(int)WrPtr & MaxWinMask));
@@ -176,7 +207,10 @@ internal static class Unpack20Local {
     UnpAllBuf=true;
   }
   else
+  {
     UnpIO_UnpWrite(Window,WrPtr,UnpPtr-WrPtr);
+  }
+
   WrPtr=UnpPtr;
 }
 
@@ -185,13 +219,21 @@ internal static class Unpack20Local {
   byte[] BitLength = new byte[BC20];
   byte[] Table = new byte[MC20*4];
   if (Inp.InAddr>ReadTop-25)
+  {
     if (!UnpReadBuf())
+    {
       return false;
+    }
+  }
+
   uint BitField=Inp.getbits();
   UnpAudioBlock=(BitField & 0x8000)!=0;
 
   if ((BitField & 0x4000) != 0)
-    new Span<byte>(UnpOldTable20).Fill(0);
+  {
+    new Span<byte>(UnpOldTable20).Clear();
+  }
+
   Inp.addbits(2);
 
   uint TableSize;
@@ -199,12 +241,17 @@ internal static class Unpack20Local {
   {
     UnpChannels=((BitField>>12) & 3)+1;
     if (UnpCurChannel>=UnpChannels)
+    {
       UnpCurChannel=0;
+    }
+
     Inp.addbits(2);
     TableSize=MC20*UnpChannels;
   }
   else
+  {
     TableSize=NC20+DC20+RC20;
+  }
 
   for (uint I=0;I<BC20;I++)
   {
@@ -215,8 +262,13 @@ internal static class Unpack20Local {
   for (uint I=0;I<TableSize;)
   {
     if (Inp.InAddr>ReadTop-5)
+    {
       if (!UnpReadBuf())
+      {
         return false;
+      }
+    }
+
     uint Number=DecodeNumber(Inp,BlockTables.BD);
     if (Number<16)
     {
@@ -229,13 +281,17 @@ internal static class Unpack20Local {
         uint N=(Inp.getbits() >> 14)+3;
         Inp.addbits(2);
         if (I==0)
+        {
           return false; // We cannot have "repeat previous" code at the first position.
+        }
         else
+        {
           while (N-- > 0 && I<TableSize)
           {
             Table[I]=Table[I-1];
             I++;
           }
+        }
       }
       else
       {
@@ -251,15 +307,24 @@ internal static class Unpack20Local {
           Inp.addbits(7);
         }
         while (N-- > 0 && I<TableSize)
+        {
           Table[I++]=0;
+        }
       }
   }
   TablesRead2=true;
   if (Inp.InAddr>ReadTop)
+  {
     return true;
+  }
+
   if (UnpAudioBlock)
+  {
     for (uint I=0;I<UnpChannels;I++)
+    {
       MakeDecodeTables(Table,(int)(I*MC20),MD[I],MC20);
+    }
+  }
   else
   {
     MakeDecodeTables(Table,0,BlockTables.LD,NC20);
@@ -267,21 +332,27 @@ internal static class Unpack20Local {
     MakeDecodeTables(Table,(int)(NC20+DC20),BlockTables.RD,RC20);
   }
   //x memcpy(UnpOldTable20,Table,sizeof(UnpOldTable20));
-  Array.Copy(Table,0,UnpOldTable20,0,UnpOldTable20.Length);
+  Array.Copy(Table,UnpOldTable20,UnpOldTable20.Length);
   return true;
 }
 
       private void ReadLastTables()
 {
   if (ReadTop>=Inp.InAddr+5)
+  {
     if (UnpAudioBlock)
     {
       if (DecodeNumber(Inp,MD[UnpCurChannel])==256)
+      {
         ReadTables20();
+      }
     }
     else
-      if (DecodeNumber(Inp,BlockTables.LD)==269)
-        ReadTables20();
+    if (DecodeNumber(Inp,BlockTables.LD)==269)
+    {
+      ReadTables20();
+    }
+  }
 }
 
       private void UnpInitData20(bool Solid)
@@ -296,7 +367,7 @@ internal static class Unpack20Local {
 
     //memset(AudV,0,sizeof(AudV));
     AudV = new AudioVariables[4];
-    new Span<byte>(UnpOldTable20).Fill(0);
+    new Span<byte>(UnpOldTable20).Clear();
     //memset(MD,0,sizeof(MD));
     MD = new DecodeTable[4];
   }
@@ -352,43 +423,73 @@ internal static class Unpack20Local {
     {
       case 1:
         if (V.K1>=-16)
+        {
           V.K1--;
+        }
+
         break;
       case 2:
         if (V.K1<16)
+        {
           V.K1++;
+        }
+
         break;
       case 3:
         if (V.K2>=-16)
+        {
           V.K2--;
+        }
+
         break;
       case 4:
         if (V.K2<16)
+        {
           V.K2++;
+        }
+
         break;
       case 5:
         if (V.K3>=-16)
+        {
           V.K3--;
+        }
+
         break;
       case 6:
         if (V.K3<16)
+        {
           V.K3++;
+        }
+
         break;
       case 7:
         if (V.K4>=-16)
+        {
           V.K4--;
+        }
+
         break;
       case 8:
         if (V.K4<16)
+        {
           V.K4++;
+        }
+
         break;
       case 9:
         if (V.K5>=-16)
+        {
           V.K5--;
+        }
+
         break;
       case 10:
         if (V.K5<16)
+        {
           V.K5++;
+        }
+
         break;
     }
   }

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack30_cpp.cs

@@ -9,9 +9,6 @@ using size_t = System.UInt64;
 #endif
 using int64 = System.Int64;
 
-using System;
-using static SharpCompress.Compressors.Rar.UnpackV2017.PackDef;
-using static SharpCompress.Compressors.Rar.UnpackV2017.UnpackGlobal;
 //using static SharpCompress.Compressors.Rar.UnpackV2017.Unpack.Unpack30Local;
 /*
 namespace SharpCompress.Compressors.Rar.UnpackV2017

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs

@@ -25,14 +25,18 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   {
     UnpInitData(Solid);
     if (!UnpReadBuf())
+    {
       return;
+    }
 
     // Check TablesRead5 to be sure that we read tables at least once
     // regardless of current block header TablePresent flag.
     // So we can safefly use these tables below.
     if (!ReadBlockHeader(Inp,ref BlockHeader) ||
         !ReadTables(Inp,ref BlockHeader, ref BlockTables) || !TablesRead5)
+    {
       return;
+    }
   }
 
   while (true)
@@ -55,17 +59,24 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
           break;
         }
         if (!ReadBlockHeader(Inp,ref BlockHeader) || !ReadTables(Inp, ref BlockHeader, ref BlockTables))
+        {
           return;
+        }
       }
       if (FileDone || !UnpReadBuf())
+      {
         break;
+      }
     }
 
     if (((WriteBorder-UnpPtr) & MaxWinMask)<MAX_LZ_MATCH+3 && WriteBorder!=UnpPtr)
     {
       UnpWriteBuf();
       if (WrittenFileSize>DestUnpSize)
+      {
         return;
+      }
+
       if (Suspended)
       {
         FileExtracted=false;
@@ -77,9 +88,14 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
     if (MainSlot<256)
     {
       if (Fragmented)
+      {
         FragWindow[UnpPtr++]=(byte)MainSlot;
+      }
       else
+      {
         Window[UnpPtr++]=(byte)MainSlot;
+      }
+
       continue;
     }
     if (MainSlot>=262)
@@ -124,32 +140,49 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
         {
           Length++;
           if (Distance>0x40000)
+          {
             Length++;
+          }
         }
       }
 
       InsertOldDist(Distance);
       LastLength=Length;
       if (Fragmented)
+      {
         FragWindow.CopyString(Length,Distance,ref UnpPtr,MaxWinMask);
+      }
       else
+      {
         CopyString(Length,Distance);
+      }
+
       continue;
     }
     if (MainSlot==256)
     {
       UnpackFilter Filter = new UnpackFilter();
       if (!ReadFilter(Inp,Filter) || !AddFilter(Filter))
+      {
         break;
+      }
+
       continue;
     }
     if (MainSlot==257)
     {
       if (LastLength!=0)
+      {
         if (Fragmented)
+        {
           FragWindow.CopyString(LastLength,OldDist[0],ref UnpPtr,MaxWinMask);
+        }
         else
+        {
           CopyString(LastLength,OldDist[0]);
+        }
+      }
+
       continue;
     }
     if (MainSlot<262)
@@ -157,16 +190,24 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       uint DistNum=MainSlot-258;
       uint Distance=OldDist[DistNum];
       for (uint I=DistNum;I>0;I--)
+      {
         OldDist[I]=OldDist[I-1];
+      }
+
       OldDist[0]=Distance;
 
       uint LengthSlot=DecodeNumber(Inp,BlockTables.RD);
       uint Length=SlotToLength(Inp,LengthSlot);
       LastLength=Length;
       if (Fragmented)
+      {
         FragWindow.CopyString(Length,Distance,ref UnpPtr,MaxWinMask);
+      }
       else
+      {
         CopyString(Length,Distance);
+      }
+
       continue;
     }
   }
@@ -190,13 +231,19 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       private bool ReadFilter(BitInput Inp,UnpackFilter Filter)
 {
   if (!Inp.ExternalBuffer && Inp.InAddr>ReadTop-16)
+  {
     if (!UnpReadBuf())
+    {
       return false;
+    }
+  }
 
   Filter.BlockStart=ReadFilterData(Inp);
   Filter.BlockLength=ReadFilterData(Inp);
   if (Filter.BlockLength>MAX_FILTER_BLOCK_SIZE)
+  {
     Filter.BlockLength=0;
+  }
 
   Filter.Type=(byte)(Inp.fgetbits()>>13);
   Inp.faddbits(3);
@@ -216,7 +263,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   {
     UnpWriteBuf(); // Write data, apply and flush filters.
     if (Filters.Count>=MAX_UNPACK_FILTERS)
+    {
       InitFilters(); // Still too many filters, prevent excessive memory use.
+    }
   }
 
   // If distance to filter start is that large that due to circular dictionary
@@ -233,7 +282,10 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
 {
   int DataSize=ReadTop-Inp.InAddr; // Data left to process.
   if (DataSize<0)
+  {
     return false;
+  }
+
   BlockHeader.BlockSize-=Inp.InAddr-BlockHeader.BlockStart;
   if (Inp.InAddr>MAX_SIZE/2)
   {
@@ -245,17 +297,29 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
     // to make it zero.
     if (DataSize>0)
       //x memmove(Inp.InBuf,Inp.InBuf+Inp.InAddr,DataSize);
+    {
       Buffer.BlockCopy(Inp.InBuf, Inp.InAddr, Inp.InBuf, 0, DataSize);
+    }
+
     Inp.InAddr=0;
     ReadTop=DataSize;
   }
   else
+  {
     DataSize=ReadTop;
+  }
+
   int ReadCode=0;
   if (MAX_SIZE!=DataSize)
+  {
     ReadCode=UnpIO_UnpRead(Inp.InBuf,DataSize,MAX_SIZE-DataSize);
+  }
+
   if (ReadCode>0) // Can be also -1.
+  {
     ReadTop+=ReadCode;
+  }
+
   ReadBorder=ReadTop-30;
   BlockHeader.BlockStart=Inp.InAddr;
   if (BlockHeader.BlockSize!=-1) // '-1' means not defined yet.
@@ -285,7 +349,10 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
 
     UnpackFilter flt=Filters[I];
     if (flt.Type==FILTER_NONE)
+    {
       continue;
+    }
+
     if (flt.NextWindow)
     {
       // Here we skip filters which have block start in current data range
@@ -301,7 +368,10 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       // our write here, we can safely assume that filter is applicable
       // to next block on no further wrap arounds is possible.
       if (((flt.BlockStart-WrPtr)&MaxWinMask)<=FullWriteSize)
+      {
         flt.NextWindow=false;
+      }
+
       continue;
     }
     uint BlockStart=flt.BlockStart;
@@ -326,10 +396,14 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
           if (BlockStart<BlockEnd || BlockEnd==0)
           {
             if (Fragmented)
+            {
               FragWindow.CopyData(Mem,0,BlockStart,BlockLength);
+            }
             else
               //x memcpy(Mem,Window+BlockStart,BlockLength);
+            {
               Utility.Copy(Window, BlockStart, Mem, 0, BlockLength);
+            }
           }
           else
           {
@@ -353,7 +427,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
           Filters[I].Type=FILTER_NONE;
 
           if (OutMem!=null)
+          {
             UnpIO_UnpWrite(OutMem,0,BlockLength);
+          }
 
           UnpSomeRead=true;
           WrittenFileSize+=BlockLength;
@@ -376,7 +452,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
         {
           UnpackFilter _flt=Filters[J];
           if (_flt.Type!=FILTER_NONE)
+          {
             _flt.NextWindow=false;
+          }
         }
 
         // Do not write data left after current filter now.
@@ -393,13 +471,20 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   for (int I=0;I<Filters.Count;I++)
   {
     if (EmptyCount>0)
+    {
       Filters[I-EmptyCount]=Filters[I];
+    }
+
     if (Filters[I].Type==FILTER_NONE)
+    {
       EmptyCount++;
+    }
   }
   if (EmptyCount>0)
     //Filters.Alloc(Filters.Count-EmptyCount);
+  {
     Filters.RemoveRange(Filters.Count-EmptyCount, EmptyCount);
+  }
 
   if (!NotAllFiltersProcessed) // Only if all filters are processed.
   {
@@ -417,7 +502,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   // If border is equal to UnpPtr, it means that we have MaxWinSize data ahead.
   if (WriteBorder==UnpPtr ||
       WrPtr!=UnpPtr && ((WrPtr-UnpPtr)&MaxWinMask)<((WriteBorder-UnpPtr)&MaxWinMask))
+  {
     WriteBorder=WrPtr;
+  }
 }
 
       private byte[] ApplyFilter(byte[] __d,uint DataSize,UnpackFilter Flt)
@@ -450,11 +537,15 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
             if ((Addr & 0x80000000)!=0)              // Addr<0
             {
               if (((Addr+Offset) & 0x80000000)==0)   // Addr+Offset>=0
+              {
                 RawPut4(Addr+FileSize,__d,Data);
+              }
             }
             else
               if (((Addr-FileSize) & 0x80000000)!=0) // Addr<FileSize
+              {
                 RawPut4(Addr-Offset,__d,Data);
+              }
 
             Data+=4;
             CurPos+=4;
@@ -498,7 +589,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
         {
           byte PrevByte=0;
           for (uint DestPos=CurChannel;DestPos<DataSize;DestPos+=Channels)
+          {
             DstData[DestPos]=(PrevByte-=__d[Data+SrcPos++]);
+          }
         }
         return DstData;
       }
@@ -510,9 +603,14 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       private void UnpWriteArea(size_t StartPtr,size_t EndPtr)
 {
   if (EndPtr!=StartPtr)
+  {
     UnpSomeRead=true;
+  }
+
   if (EndPtr<StartPtr)
+  {
     UnpAllBuf=true;
+  }
 
   if (Fragmented)
   {
@@ -534,17 +632,25 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       UnpWriteData(Window,0,EndPtr);
     }
     else
+    {
       UnpWriteData(Window,StartPtr,EndPtr-StartPtr);
+    }
 }
 
       private void UnpWriteData(byte[] Data, size_t offset, size_t Size)
 {
   if (WrittenFileSize>=DestUnpSize)
+  {
     return;
+  }
+
   size_t WriteSize=Size;
   int64 LeftToWrite=DestUnpSize-WrittenFileSize;
   if ((int64)WriteSize>LeftToWrite)
+  {
     WriteSize=(size_t)LeftToWrite;
+  }
+
   UnpIO_UnpWrite(Data, offset, WriteSize);
   WrittenFileSize+=Size;
 }
@@ -552,7 +658,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       private void UnpInitData50(bool Solid)
 {
   if (!Solid)
+  {
     TablesRead5=false;
+  }
 }
 
       private bool ReadBlockHeader(BitInput Inp,ref UnpackBlockHeader Header)
@@ -560,8 +668,13 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   Header.HeaderSize=0;
 
   if (!Inp.ExternalBuffer && Inp.InAddr>ReadTop-7)
+  {
     if (!UnpReadBuf())
+    {
       return false;
+    }
+  }
+
   Inp.faddbits((uint)((8-Inp.InBit)&7));
 
   byte BlockFlags=(byte)(Inp.fgetbits()>>8);
@@ -569,7 +682,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   uint ByteCount=(uint)(((BlockFlags>>3)&3)+1); // Block size byte count.
 
   if (ByteCount==4)
+  {
     return false;
+  }
 
   Header.HeaderSize=(int)(2+ByteCount);
 
@@ -588,7 +703,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   Header.BlockSize=BlockSize;
   byte CheckSum=(byte)(0x5a^BlockFlags^BlockSize^(BlockSize>>8)^(BlockSize>>16));
   if (CheckSum!=SavedCheckSum)
+  {
     return false;
+  }
 
   Header.BlockStart=Inp.InAddr;
   ReadBorder=Math.Min(ReadBorder,Header.BlockStart+Header.BlockSize-1);
@@ -601,11 +718,17 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       private bool ReadTables(BitInput Inp,ref UnpackBlockHeader Header, ref UnpackBlockTables Tables)
 {
   if (!Header.TablePresent)
+  {
     return true;
+  }
 
   if (!Inp.ExternalBuffer && Inp.InAddr>ReadTop-25)
+  {
     if (!UnpReadBuf())
+    {
       return false;
+    }
+  }
 
   byte[] BitLength = new byte[BC];
   for (uint I=0;I<BC;I++)
@@ -617,17 +740,24 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       uint ZeroCount=(byte)(Inp.fgetbits() >> 12);
       Inp.faddbits(4);
       if (ZeroCount==0)
+      {
         BitLength[I]=15;
+      }
       else
       {
         ZeroCount+=2;
         while (ZeroCount-- > 0 && I<BitLength.Length)
+        {
           BitLength[I++]=0;
+        }
+
         I--;
       }
     }
     else
+    {
       BitLength[I]=(byte)Length;
+    }
   }
 
   MakeDecodeTables(BitLength,0,Tables.BD,BC);
@@ -637,8 +767,13 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   for (uint I=0;I<TableSize;)
   {
     if (!Inp.ExternalBuffer && Inp.InAddr>ReadTop-5)
+    {
       if (!UnpReadBuf())
+      {
         return false;
+      }
+    }
+
     uint Number=DecodeNumber(Inp,Tables.BD);
     if (Number<16)
     {
@@ -669,11 +804,13 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
           return false;
         }
         else
+        {
           while (N-- > 0 && I<TableSize)
           {
             Table[I]=Table[I-1];
             I++;
           }
+        }
       }
       else
       {
@@ -689,12 +826,17 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
           Inp.faddbits(7);
         }
         while (N-- > 0 && I<TableSize)
+        {
           Table[I++]=0;
+        }
       }
   }
   TablesRead5=true;
   if (!Inp.ExternalBuffer && Inp.InAddr>ReadTop)
+  {
     return false;
+  }
+
   MakeDecodeTables(Table, 0, Tables.LD,NC);
   MakeDecodeTables(Table, (int)NC,Tables.DD,DC);
   MakeDecodeTables(Table, (int)(NC+DC),Tables.LDD,LDC);

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack_cpp.cs

@@ -70,7 +70,9 @@ public Unpack(/* ComprDataIO *DataIO */)
   // will be 0 because of size_t overflow. Let's issue the memory error.
   if (WinSize==0)
     //ErrHandler.MemoryError();
+  {
     throw new InvalidFormatException("invalid window size (possibly due to a rar file with a 4GB being unpacked on a 32-bit platform)");
+  }
 
   // Minimum window size must be at least twice more than maximum possible
   // size of filter block, which is 0x10000 in RAR now. If window size is
@@ -79,12 +81,19 @@ public Unpack(/* ComprDataIO *DataIO */)
   // use 0x40000 for extra safety and possible filter area size expansion.
   const size_t MinAllocSize=0x40000;
   if (WinSize<MinAllocSize)
+  {
     WinSize=MinAllocSize;
+  }
 
   if (WinSize<=MaxWinSize) // Use the already allocated window.
+  {
     return;
+  }
+
   if ((WinSize>>16)>0x10000) // Window size must not exceed 4 GB.
+  {
     return;
+  }
 
   // Archiving code guarantees that window size does not grow in the same
   // solid stream. So if we are here, we are either creating a new window
@@ -96,11 +105,14 @@ public Unpack(/* ComprDataIO *DataIO */)
   // We do not handle growth for existing fragmented window.
   if (Grow && Fragmented)
     //throw std::bad_alloc();
+  {
     throw new InvalidFormatException("Grow && Fragmented");
+  }
 
   byte[] NewWindow=Fragmented ? null : new byte[WinSize];
 
   if (NewWindow==null)
+  {
     if (Grow || WinSize<0x1000000)
     {
       // We do not support growth for new fragmented window.
@@ -118,6 +130,7 @@ public Unpack(/* ComprDataIO *DataIO */)
       FragWindow.Init(WinSize);
       Fragmented=true;
     }
+  }
 
   if (!Fragmented)
   {
@@ -132,8 +145,12 @@ public Unpack(/* ComprDataIO *DataIO */)
     // RAR archiving code does not allow it in solid streams now,
     // but let's implement it anyway just in case we'll change it sometimes.
     if (Grow)
+    {
       for (size_t I=1;I<=MaxWinSize;I++)
+      {
         NewWindow[(UnpPtr-I)&(WinSize-1)]=Window[(UnpPtr-I)&(MaxWinSize-1)];
+      }
+    }
 
     //if (Window!=null)
     //  free(Window);
@@ -154,18 +171,27 @@ public Unpack(/* ComprDataIO *DataIO */)
 #if !RarV2017_SFX_MODULE
     case 15: // rar 1.5 compression
       if (!Fragmented)
+      {
         Unpack15(Solid);
+      }
+
       break;
     case 20: // rar 2.x compression
     case 26: // files larger than 2GB
       if (!Fragmented)
+      {
         Unpack20(Solid);
+      }
+
       break;
 #endif
 #if !RarV2017_RAR5ONLY
     case 29: // rar 3.x compression
       if (!Fragmented)
+      {
         throw new NotImplementedException();
+      }
+
       break;
 #endif
     case 50: // RAR 5.0 compression algorithm.
@@ -196,7 +222,7 @@ public Unpack(/* ComprDataIO *DataIO */)
 {
   if (!Solid)
   {
-    new Span<uint>(OldDist).Fill(0);
+    new Span<uint>(OldDist).Clear();
     OldDistPtr=0;
     LastDist=LastLength=0;
 //    memset(Window,0,MaxWinSize);
@@ -239,14 +265,16 @@ public Unpack(/* ComprDataIO *DataIO */)
   uint[] LengthCount = new uint[16];
   //memset(LengthCount,0,sizeof(LengthCount));
   for (size_t I=0;I<Size;I++)
+  {
     LengthCount[LengthTable[offset+I] & 0xf]++;
+  }
 
   // We must not calculate the number of zero length codes.
   LengthCount[0]=0;
 
   // Set the entire DecodeNum to zero.
   //memset(Dec->DecodeNum,0,Size*sizeof(*Dec->DecodeNum));
-  new Span<ushort>(Dec.DecodeNum).Fill(0);
+  new Span<ushort>(Dec.DecodeNum).Clear();
 
   // Initialize not really used entry for zero length code.
   Dec.DecodePos[0]=0;
@@ -280,7 +308,7 @@ public Unpack(/* ComprDataIO *DataIO */)
   // so we cannot use the original DecodePos.
   uint[] CopyDecodePos = new uint[Dec.DecodePos.Length];
   //memcpy(CopyDecodePos,Dec->DecodePos,sizeof(CopyDecodePos));
-  Array.Copy(Dec.DecodePos, 0, CopyDecodePos, 0, CopyDecodePos.Length);
+  Array.Copy(Dec.DecodePos, CopyDecodePos, CopyDecodePos.Length);
 
   // For every bit length in the bit length table and so for every item
   // of alphabet.
@@ -341,7 +369,9 @@ public Unpack(/* ComprDataIO *DataIO */)
     // Find the upper limit for current bit field and adjust the bit length
     // accordingly if necessary.
     while (CurBitLength<Dec.DecodeLen.Length && BitField>=Dec.DecodeLen[CurBitLength])
+    {
       CurBitLength++;
+    }
 
     // Translation of right aligned bit string to bit length.
     Dec.QuickLen[Code]=CurBitLength;

src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpackinline_cpp.cs

@@ -94,6 +94,7 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
 //    if (Length>6) { Dest[6]=Src[6]; } } } } } } } // Close all nested "if"s.
   }
   else
+  {
     while (Length-- > 0) // Slow copying with all possible precautions.
     {
       Window[UnpPtr]=Window[SrcPtr++ & MaxWinMask];
@@ -101,6 +102,7 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
       // be replaced with 'Window[UnpPtr++ & MaxWinMask]'
       UnpPtr=(UnpPtr+1) & MaxWinMask;
     }
+  }
 }
 
       private uint DecodeNumber(BitInput Inp,DecodeTable Dec)
@@ -118,11 +120,13 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
   // Detect the real bit length for current code.
   uint Bits=15;
   for (uint I=Dec.QuickBits+1;I<15;I++)
+  {
     if (BitField<Dec.DecodeLen[I])
     {
       Bits=I;
       break;
     }
+  }
 
   Inp.addbits(Bits);
   
@@ -140,7 +144,9 @@ namespace SharpCompress.Compressors.Rar.UnpackV2017
 
   // Out of bounds safety check required for damaged archives.
   if (Pos>=Dec.MaxNum)
+  {
     Pos=0;
+  }
 
   // Convert the position in the code list to position in alphabet
   // and return it.

src/SharpCompress/Compressors/Rar/UnpackV2017/unpack_hpp.cs

@@ -432,7 +432,10 @@ internal partial class Unpack
     private uint GetChar()
     {
       if (Inp.InAddr>MAX_SIZE-30)
-        UnpReadBuf();
+      {
+          UnpReadBuf();
+      }
+
       return(Inp.InBuf[Inp.InAddr++]);
     }
 

src/SharpCompress/Compressors/Xz/BinaryUtils.cs

@@ -36,7 +36,9 @@ namespace SharpCompress.Compressors.Xz
             var result = BitConverter.GetBytes(uint32);
 
             if (BitConverter.IsLittleEndian)
+            {
                 Array.Reverse(result);
+            }
 
             return result;
         }
@@ -46,7 +48,9 @@ namespace SharpCompress.Compressors.Xz
             var result = BitConverter.GetBytes(uint32);
 
             if (!BitConverter.IsLittleEndian)
+            {
                 Array.Reverse(result);
+            }
 
             return result;
         }

src/SharpCompress/Compressors/Xz/Crc32.cs

@@ -28,22 +28,33 @@ namespace SharpCompress.Compressors.Xz
         private static UInt32[] InitializeTable(UInt32 polynomial)
         {
             if (polynomial == DefaultPolynomial && defaultTable != null)
+            {
                 return defaultTable;
+            }
 
             var createTable = new UInt32[256];
             for (var i = 0; i < 256; i++)
             {
                 var entry = (UInt32)i;
                 for (var j = 0; j < 8; j++)
+                {
                     if ((entry & 1) == 1)
+                    {
                         entry = (entry >> 1) ^ polynomial;
+                    }
                     else
+                    {
                         entry = entry >> 1;
+                    }
+                }
+
                 createTable[i] = entry;
             }
 
             if (polynomial == DefaultPolynomial)
+            {
                 defaultTable = createTable;
+            }
 
             return createTable;
         }
@@ -52,7 +63,10 @@ namespace SharpCompress.Compressors.Xz
         {
             var crc = seed;
             for (var i = start; i < size - start; i++)
+            {
                 crc = (crc >> 8) ^ table[buffer[i] ^ crc & 0xff];
+            }
+
             return crc;
         }
 

src/SharpCompress/Compressors/Xz/Crc64.cs

@@ -19,7 +19,9 @@ namespace SharpCompress.Compressors.Xz
         public static UInt64 Compute(UInt64 seed, byte[] buffer)
         {
             if (Table == null)
+            {
                 Table = CreateTable(Iso3309Polynomial);
+            }
 
             return CalculateHash(seed, Table, buffer, 0, buffer.Length);
         }
@@ -29,10 +31,12 @@ namespace SharpCompress.Compressors.Xz
             var crc = seed;
 
             for (var i = start; i < size; i++)
+            {
                 unchecked
                 {
                     crc = (crc >> 8) ^ table[(buffer[i] ^ crc) & 0xff];
                 }
+            }
 
             return crc;
         }
@@ -44,10 +48,17 @@ namespace SharpCompress.Compressors.Xz
             {
                 var entry = (UInt64)i;
                 for (var j = 0; j < 8; ++j)
+                {
                     if ((entry & 1) == 1)
+                    {
                         entry = (entry >> 1) ^ polynomial;
+                    }
                     else
+                    {
                         entry = entry >> 1;
+                    }
+                }
+
                 createTable[i] = entry;
             }
             return createTable;

src/SharpCompress/Compressors/Xz/Filters/BlockFilter.cs

@@ -35,12 +35,18 @@ namespace SharpCompress.Compressors.Xz.Filters
         {
             var filterType = (FilterTypes)reader.ReadXZInteger();
             if (!FilterMap.ContainsKey(filterType))
+            {
                 throw new NotImplementedException($"Filter {filterType} has not yet been implemented");
+            }
+
             var filter = Activator.CreateInstance(FilterMap[filterType]) as BlockFilter;
 
             var sizeOfProperties = reader.ReadXZInteger();
             if (sizeOfProperties > int.MaxValue)
+            {
                 throw new InvalidDataException("Block filter information too large");
+            }
+
             byte[] properties = reader.ReadBytes((int)sizeOfProperties);
             filter.Init(properties);
             return filter;

src/SharpCompress/Compressors/Xz/Filters/Lzma2Filter.cs

@@ -16,7 +16,10 @@ namespace SharpCompress.Compressors.Xz.Filters
             get
             {
                 if (_dictionarySize > 40)
+                {
                     throw new OverflowException("Dictionary size greater than UInt32.Max");
+                }
+
                 if (_dictionarySize == 40)
                 {
                     return uint.MaxValue;
@@ -30,12 +33,16 @@ namespace SharpCompress.Compressors.Xz.Filters
         public override void Init(byte[] properties)
         {
             if (properties.Length != 1)
+            {
                 throw new InvalidDataException("LZMA properties unexpected length");
+            }
 
             _dictionarySize = (byte)(properties[0] & 0x3F);
             var reserved = properties[0] & 0xC0;
             if (reserved != 0)
+            {
                 throw new InvalidDataException("Reserved bits used in LZMA properties");
+            }
         }
 
         public override void ValidateFilter()

src/SharpCompress/Compressors/Xz/MultiByteIntegers.cs

@@ -8,9 +8,14 @@ namespace SharpCompress.Compressors.Xz
         public static ulong ReadXZInteger(this BinaryReader reader, int MaxBytes = 9)
         {
             if (MaxBytes <= 0)
+            {
                 throw new ArgumentOutOfRangeException();
+            }
+
             if (MaxBytes > 9)
+            {
                 MaxBytes = 9;
+            }
 
             byte LastByte = reader.ReadByte();
             ulong Output = (ulong)LastByte & 0x7F;
@@ -19,10 +24,15 @@ namespace SharpCompress.Compressors.Xz
             while ((LastByte & 0x80) != 0)
             {
                 if (++i >= MaxBytes)
+                {
                     throw new InvalidDataException();
+                }
+
                 LastByte = reader.ReadByte();
                 if (LastByte == 0)
+                {
                     throw new InvalidDataException();
+                }
 
                 Output |= ((ulong)(LastByte & 0x7F)) << (i * 7);
             }

src/SharpCompress/Compressors/Xz/XZBlock.cs

@@ -33,17 +33,35 @@ namespace SharpCompress.Compressors.Xz
         {
             int bytesRead = 0;
             if (!HeaderIsLoaded)
+            {
                 LoadHeader();
+            }
+
             if (!_streamConnected)
+            {
                 ConnectStream();
+            }
+
             if (!_endOfStream)
+            {
                 bytesRead = _decomStream.Read(buffer, offset, count);
+            }
+
             if (bytesRead != count)
+            {
                 _endOfStream = true;
+            }
+
             if (_endOfStream && !_paddingSkipped)
+            {
                 SkipPadding();
+            }
+
             if (_endOfStream && !_crcChecked)
+            {
                 CheckCrc();
+            }
+
             _bytesRead += (ulong)bytesRead;
             return bytesRead;
         }
@@ -56,7 +74,9 @@ namespace SharpCompress.Compressors.Xz
                 byte[] paddingBytes = new byte[4 - bytes];
                 BaseStream.Read(paddingBytes, 0, paddingBytes.Length);
                 if (paddingBytes.Any(b => b != 0))
+                {
                     throw new InvalidDataException("Padding bytes were non-null");
+                }
             }
             _paddingSkipped = true;
         }
@@ -101,7 +121,9 @@ namespace SharpCompress.Compressors.Xz
         {
             _blockHeaderSizeByte = (byte)BaseStream.ReadByte();
             if (_blockHeaderSizeByte == 0)
+            {
                 throw new XZIndexMarkerReachedException();
+            }
         }
 
         private byte[] CacheHeader()
@@ -110,12 +132,16 @@ namespace SharpCompress.Compressors.Xz
             blockHeaderWithoutCrc[0] = _blockHeaderSizeByte;
             var read = BaseStream.Read(blockHeaderWithoutCrc, 1, BlockHeaderSize - 5);
             if (read != BlockHeaderSize - 5)
+            {
                 throw new EndOfStreamException("Reached end of stream unexectedly");
+            }
 
             uint crc = BaseStream.ReadLittleEndianUInt32();
             uint calcCrc = Crc32.Compute(blockHeaderWithoutCrc);
             if (crc != calcCrc)
+            {
                 throw new InvalidDataException("Block header corrupt");
+            }
 
             return blockHeaderWithoutCrc;
         }
@@ -127,15 +153,22 @@ namespace SharpCompress.Compressors.Xz
             byte reserved = (byte)(blockFlags & 0x3C);
 
             if (reserved != 0)
+            {
                 throw new InvalidDataException("Reserved bytes used, perhaps an unknown XZ implementation");
+            }
 
             bool compressedSizePresent = (blockFlags & 0x40) != 0;
             bool uncompressedSizePresent = (blockFlags & 0x80) != 0;
 
             if (compressedSizePresent)
+            {
                 CompressedSize = reader.ReadXZInteger();
+            }
+
             if (uncompressedSizePresent)
+            {
                 UncompressedSize = reader.ReadXZInteger();
+            }
         }
 
         private void ReadFilters(BinaryReader reader, long baseStreamOffset = 0)
@@ -146,20 +179,30 @@ namespace SharpCompress.Compressors.Xz
                 var filter = BlockFilter.Read(reader);
                 if ((i + 1 == _numFilters && !filter.AllowAsLast)
                     || (i + 1 < _numFilters && !filter.AllowAsNonLast))
+                {
                     throw new InvalidDataException("Block Filters in bad order");
+                }
+
                 if (filter.ChangesDataSize && i + 1 < _numFilters)
+                {
                     nonLastSizeChangers++;
+                }
+
                 filter.ValidateFilter();
                 Filters.Push(filter);
             }
             if (nonLastSizeChangers > 2)
+            {
                 throw new InvalidDataException("More than two non-last block filters cannot change stream size");
+            }
 
             int blockHeaderPaddingSize = BlockHeaderSize -
-                (4 + (int)(reader.BaseStream.Position - baseStreamOffset));
+                                         (4 + (int)(reader.BaseStream.Position - baseStreamOffset));
             byte[] blockHeaderPadding = reader.ReadBytes(blockHeaderPaddingSize);
             if (!blockHeaderPadding.All(b => b == 0))
+            {
                 throw new InvalidDataException("Block header contains unknown fields");
+            }
         }
     }
 }

src/SharpCompress/Compressors/Xz/XZFooter.cs

@@ -32,7 +32,10 @@ namespace SharpCompress.Compressors.Xz
             byte[] footerBytes = _reader.ReadBytes(6);
             uint myCrc = Crc32.Compute(footerBytes);
             if (crc != myCrc)
+            {
                 throw new InvalidDataException("Footer corrupt");
+            }
+
             using (var stream = new MemoryStream(footerBytes))
             using (var reader = new BinaryReader(stream))
             {

src/SharpCompress/Compressors/Xz/XZHeader.cs

@@ -38,18 +38,24 @@ namespace SharpCompress.Compressors.Xz
             UInt32 crc = _reader.ReadLittleEndianUInt32();
             UInt32 calcCrc = Crc32.Compute(streamFlags);
             if (crc != calcCrc)
+            {
                 throw new InvalidDataException("Stream header corrupt");
+            }
 
             BlockCheckType = (CheckType)(streamFlags[1] & 0x0F);
             byte futureUse = (byte)(streamFlags[1] & 0xF0);
             if (futureUse != 0 || streamFlags[0] != 0)
+            {
                 throw new InvalidDataException("Unknown XZ Stream Version");
+            }
         }
 
         private void CheckMagicBytes(byte[] header)
         {
             if (!header.SequenceEqual(MagicHeader))
+            {
                 throw new InvalidDataException("Invalid XZ Stream");
+            }
         }
     }
 }

src/SharpCompress/Compressors/Xz/XZIndex.cs

@@ -23,7 +23,9 @@ namespace SharpCompress.Compressors.Xz
             _indexMarkerAlreadyVerified = indexMarkerAlreadyVerified;
             StreamStartPosition = reader.BaseStream.Position;
             if (indexMarkerAlreadyVerified)
+            {
                 StreamStartPosition--;
+            }
         }
 
         public static XZIndex FromStream(Stream stream, bool indexMarkerAlreadyVerified)
@@ -36,7 +38,10 @@ namespace SharpCompress.Compressors.Xz
         public void Process()
         {
             if (!_indexMarkerAlreadyVerified)
+            {
                 VerifyIndexMarker();
+            }
+
             NumberOfRecords = _reader.ReadXZInteger();
             for (ulong i = 0; i < NumberOfRecords; i++)
             {
@@ -50,7 +55,9 @@ namespace SharpCompress.Compressors.Xz
         {
             byte marker = _reader.ReadByte();
             if (marker != 0)
+            {
                 throw new InvalidDataException("Not an index block");
+            }
         }
 
         private void SkipPadding()
@@ -60,7 +67,9 @@ namespace SharpCompress.Compressors.Xz
             {
                 byte[] paddingBytes = _reader.ReadBytes(4 - bytes);
                 if (paddingBytes.Any(b => b != 0))
+                {
                     throw new InvalidDataException("Padding bytes were non-null");
+                }
             }
         }
 

src/SharpCompress/Compressors/Xz/XZReadOnlyStream.cs

@@ -8,7 +8,9 @@ namespace SharpCompress.Compressors.Xz
         {
             BaseStream = stream;
             if (!BaseStream.CanRead)
+            {
                 throw new InvalidDataException("Must be able to read from stream");
+            }
         }
     }
 }

src/SharpCompress/Compressors/Xz/XZStream.cs

@@ -50,9 +50,15 @@ namespace SharpCompress.Compressors.Xz
         {
             int bytesRead = 0;
             if (_endOfStream)
+            {
                 return bytesRead;
+            }
+
             if (!HeaderIsRead)
+            {
                 ReadHeader();
+            }
+
             bytesRead = ReadBlocks(buffer, offset, count);
             if (bytesRead < count)
             {
@@ -86,18 +92,27 @@ namespace SharpCompress.Compressors.Xz
         {
             int bytesRead = 0;
             if (_currentBlock == null)
+            {
                 NextBlock();
+            }
+
             for (;;)
             {
                 try
                 {
                     if (bytesRead >= count)
+                    {
                         break;
+                    }
+
                     int remaining = count - bytesRead;
                     int newOffset = offset + bytesRead;
                     int justRead = _currentBlock.Read(buffer, newOffset, remaining);
                     if (justRead < remaining)
+                    {
                         NextBlock();
+                    }
+
                     bytesRead += justRead;
                 }
                 catch (XZIndexMarkerReachedException)

src/SharpCompress/Crypto/Crc32Stream.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 
 namespace SharpCompress.Crypto
@@ -79,22 +78,33 @@ namespace SharpCompress.Crypto
         private static uint[] InitializeTable(uint polynomial)
         {
             if (polynomial == DefaultPolynomial && defaultTable != null)
+            {
                 return defaultTable;
+            }
 
             var createTable = new uint[256];
             for (var i = 0; i < 256; i++)
             {
                 var entry = (uint)i;
                 for (var j = 0; j < 8; j++)
+                {
                     if ((entry & 1) == 1)
+                    {
                         entry = (entry >> 1) ^ polynomial;
+                    }
                     else
+                    {
                         entry = entry >> 1;
+                    }
+                }
+
                 createTable[i] = entry;
             }
 
             if (polynomial == DefaultPolynomial)
+            {
                 defaultTable = createTable;
+            }
 
             return createTable;
         }

src/SharpCompress/Crypto/RijndaelEngine.cs

@@ -9,7 +9,7 @@ namespace SharpCompress.Crypto
 
         private static readonly int MAXKC = (256 / 4);
 
-        private static readonly byte[] Logtable =
+        private static ReadOnlySpan<byte> Logtable => new byte[]
         {
             0, 0, 25, 1, 50, 2, 26, 198,
             75, 199, 27, 104, 51, 238, 223, 3,
@@ -45,7 +45,7 @@ namespace SharpCompress.Crypto
             13, 99, 140, 128, 192, 247, 112, 7
         };
 
-        private static readonly byte[] Alogtable =
+        private static ReadOnlySpan<byte> Alogtable => new byte[]
         {
             0, 3, 5, 15, 17, 51, 85, 255, 26, 46, 114, 150, 161, 248, 19, 53,
             95, 225, 56, 72, 216, 115, 149, 164, 247, 2, 6, 10, 30, 34, 102, 170,
@@ -121,7 +121,7 @@ namespace SharpCompress.Crypto
             23, 43, 4, 126, 186, 119, 214, 38, 225, 105, 20, 99, 85, 33, 12, 125
         };
 
-        private static readonly byte[] rcon =
+        private static ReadOnlySpan<byte> rcon => new byte[]
         {
             0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a,
             0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91

src/SharpCompress/IO/RewindableStream.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using SharpCompress.Compressors.Filters;
 
 namespace SharpCompress.IO
 {

src/SharpCompress/SharpCompress.csproj

@@ -2,9 +2,9 @@
   <PropertyGroup>
     <AssemblyTitle>SharpCompress - Pure C# Decompression/Compression</AssemblyTitle>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>0.25.0</VersionPrefix>
-    <AssemblyVersion>0.25.0</AssemblyVersion>
-    <FileVersion>0.25.0</FileVersion>
+    <VersionPrefix>0.25.1</VersionPrefix>
+    <AssemblyVersion>0.25.1</AssemblyVersion>
+    <FileVersion>0.25.1</FileVersion>
     <Authors>Adam Hathcock</Authors>
     <TargetFrameworks Condition="'$(LibraryFrameworks)'==''">netstandard1.3;netstandard2.0;netstandard2.1;net46</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
@@ -20,15 +20,15 @@
     <PackageLicenseUrl>https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt</PackageLicenseUrl>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Description>SharpCompress is a compression library for NET Standard 1.3/2.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</Description>
+    <Description>SharpCompress is a compression library for NET Standard 1.3/2.0/NET 4.6 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</Description>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.1' ">
     <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net46' ">
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
+  </ItemGroup>
 </Project>

src/SharpCompress/Utility.cs

@@ -71,11 +71,19 @@ namespace SharpCompress
         public static void Copy(Array sourceArray, long sourceIndex, Array destinationArray, long destinationIndex, long length)
         {
             if (sourceIndex > Int32.MaxValue || sourceIndex < Int32.MinValue)
+            {
                 throw new ArgumentOutOfRangeException();
+            }
+
             if (destinationIndex > Int32.MaxValue || destinationIndex < Int32.MinValue)
+            {
                 throw new ArgumentOutOfRangeException();
+            }
+
             if (length > Int32.MaxValue || length < Int32.MinValue)
+            {
                 throw new ArgumentOutOfRangeException();
+            }
 
             Array.Copy(sourceArray, (int)sourceIndex, destinationArray, (int)destinationIndex, (int)length);
         }

src/SharpCompress/Writers/Zip/ZipCentralDirectoryEntry.cs

@@ -55,7 +55,9 @@ namespace SharpCompress.Writers.Zip
                 // so this extra guard is not required, but kept to simplify changing the code
                 // once the zip64 post-data issue is resolved
                 if (!zip64_stream)
+                {
                     flags |= HeaderFlags.UsePostDataDescriptor;
+                }
 
                 if (usedCompression == ZipCompressionMethod.LZMA)
                 {
@@ -65,7 +67,9 @@ namespace SharpCompress.Writers.Zip
 
             // Support for zero byte files
             if (Decompressed == 0 && Compressed == 0)
+            {
                 usedCompression = ZipCompressionMethod.None;
+            }
 
             byte[] intBuf = new byte[] { 80, 75, 1, 2, version, 0, version, 0 };
             //constant sig, then version made by, then version to extract

src/SharpCompress/Writers/Zip/ZipWriter.cs

@@ -132,7 +132,9 @@ namespace SharpCompress.Writers.Zip
             // Use the archive default setting for zip64 and allow overrides
             var useZip64 = isZip64;
             if (options.EnableZip64.HasValue)
+            {
                 useZip64 = options.EnableZip64.Value;
+            }
 
             var headersize = (uint)WriteHeader(entryPath, options, entry, useZip64);
             streamPosition += headersize;
@@ -157,7 +159,9 @@ namespace SharpCompress.Writers.Zip
         {
             // We err on the side of caution until the zip specification clarifies how to support this
             if (!OutputStream.CanSeek && useZip64)
+            {
                 throw new NotSupportedException("Zip64 extensions are not supported on non-seekable streams");
+            }
 
             var explicitZipCompressionInfo = ToZipCompressionMethod(zipWriterEntryOptions.CompressionType ?? compressionType);
             byte[] encodedFilename = WriterOptions.ArchiveEncoding.Encode(filename);
@@ -169,9 +173,13 @@ namespace SharpCompress.Writers.Zip
             if (explicitZipCompressionInfo == ZipCompressionMethod.Deflate)
             {
                 if (OutputStream.CanSeek && useZip64)
+                {
                     OutputStream.Write(new byte[] { 45, 0 }, 0, 2); //smallest allowed version for zip64
+                }
                 else
+                {
                     OutputStream.Write(new byte[] { 20, 0 }, 0, 2); //older version which is more compatible
+                }
             }
             else
             {
@@ -204,7 +212,9 @@ namespace SharpCompress.Writers.Zip
 
             var extralength = 0;
             if (OutputStream.CanSeek && useZip64)
+            {
                 extralength = 2 + 2 + 8 + 8;
+            }
 
             BinaryPrimitives.WriteUInt16LittleEndian(intBuf, (ushort)extralength);
             OutputStream.Write(intBuf, 0, 2); // extra length
@@ -428,7 +438,9 @@ namespace SharpCompress.Writers.Zip
                         // Ideally, we should not throw from Dispose()
                         // We should not get here as the Write call checks the limits
                         if (zip64 && entry.Zip64HeaderOffset == 0)
+                        {
                             throw new NotSupportedException("Attempted to write a stream that is larger than 4GiB without setting the zip64 option");
+                        }
 
                         // If we have pre-allocated space for zip64 data,
                         // fill it out, even if it is not required
@@ -459,7 +471,9 @@ namespace SharpCompress.Writers.Zip
                         // Ideally, we should not throw from Dispose()
                         // We should not get here as the Write call checks the limits
                         if (zip64)
+                        {
                             throw new NotSupportedException("Streams larger than 4GiB are not supported for non-seekable streams");
+                        }
 
                         byte[] intBuf = new byte[4];
                         BinaryPrimitives.WriteUInt32LittleEndian(intBuf, ZipHeaderFactory.POST_DATA_DESCRIPTOR);
@@ -501,7 +515,9 @@ namespace SharpCompress.Writers.Zip
                 {
                     // Pre-check, the counting.Count is not exact, as we do not know the size before having actually compressed it
                     if (limitsExceeded || ((decompressed + (uint)count) > uint.MaxValue) || (counting.Count + (uint)count) > uint.MaxValue)
+                    {
                         throw new NotSupportedException("Attempted to write a stream that is larger than 4GiB without setting the zip64 option");
+                    }
                 }
 
                 decompressed += (uint)count;

src/SharpCompress/Writers/Zip/ZipWriterOptions.cs

@@ -1,5 +1,4 @@
-using SharpCompress.Archives;
-using SharpCompress.Common;
+using SharpCompress.Common;
 using SharpCompress.Compressors.Deflate;
 
 namespace SharpCompress.Writers.Zip

tests/SharpCompress.Test/ADCTest.cs

@@ -23,7 +23,6 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
 using System.IO;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.ADC;

tests/SharpCompress.Test/SharpCompress.Test.csproj

@@ -12,10 +12,10 @@
     <ProjectReference Include="..\..\src\SharpCompress\SharpCompress.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.8" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
   </ItemGroup>
 </Project>

tests/SharpCompress.Test/Tar/TarArchiveTests.cs

@@ -61,7 +61,9 @@ namespace SharpCompress.Test.Tar
                 Assert.Contains(filename, archive2.Entries.Select(entry => entry.Key));
 
                 foreach (var entry in archive2.Entries)
+                {
                     Assert.Equal("dummy filecontent", new StreamReader(entry.OpenEntryStream()).ReadLine());
+                }
             }
         }
 
@@ -89,7 +91,10 @@ namespace SharpCompress.Test.Tar
             // create a very long filename
             string longFilename = "";
             for (int i = 0; i < 600; i = longFilename.Length)
+            {
                 longFilename += i.ToString("D10") + "-";
+            }
+
             longFilename += ".txt";
 
             // Step 1: create a tar file containing a file with a long name
@@ -113,7 +118,9 @@ namespace SharpCompress.Test.Tar
                 Assert.Contains(longFilename, archive2.Entries.Select(entry => entry.Key));
 
                 foreach (var entry in archive2.Entries)
+                {
                     Assert.Equal("dummy filecontent", new StreamReader(entry.OpenEntryStream()).ReadLine());
+                }
             }
         }
 

tests/SharpCompress.Test/WriterTests.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Text;
 using SharpCompress.Common;
 using SharpCompress.IO;

tests/SharpCompress.Test/Xz/XZBlockTests.cs

@@ -22,7 +22,10 @@ namespace SharpCompress.Test.Xz
             byte[] buffer = new byte[bytesToRead];
             var read = block.Read(buffer, 0, bytesToRead);
             if (read != bytesToRead)
+            {
                 throw new EndOfStreamException();
+            }
+
             return buffer;
         }
 

tests/SharpCompress.Test/Zip/Zip64Tests.cs

@@ -104,23 +104,36 @@ namespace SharpCompress.Test.Zip
             filename = Path.Combine(SCRATCH2_FILES_PATH, filename);
             
             if (File.Exists(filename))
+            {
                 File.Delete(filename);
+            }
 
             if (!File.Exists(filename))
+            {
                 CreateZipArchive(filename, files, filesize, write_chunk_size, set_zip64, forward_only);
+            }
 
             var resForward = ReadForwardOnly(filename);
             if (resForward.Item1 != files)
+            {
                 throw new Exception($"Incorrect number of items reported: {resForward.Item1}, should have been {files}");
+            }
 
-			if (resForward.Item2 != files * filesize)
-				throw new Exception($"Incorrect combined size reported: {resForward.Item2}, should have been {files * filesize}");
+            if (resForward.Item2 != files * filesize)
+            {
+                throw new Exception($"Incorrect combined size reported: {resForward.Item2}, should have been {files * filesize}");
+            }
 
             var resArchive = ReadArchive(filename);
             if (resArchive.Item1 != files)
+            {
                 throw new Exception($"Incorrect number of items reported: {resArchive.Item1}, should have been {files}");
+            }
+
             if (resArchive.Item2 != files * filesize)
+            {
                 throw new Exception($"Incorrect number of items reported: {resArchive.Item2}, should have been {files * filesize}");
+            }
         }
 
         public void CreateZipArchive(string filename, long files, long filesize, long chunksize, bool set_zip64, bool forward_only)
@@ -139,6 +152,7 @@ namespace SharpCompress.Test.Zip
             {
 
                 for (var i = 0; i < files; i++)
+                {
                     using (var str = zipWriter.WriteToStream(i.ToString(), eo))
                     {
                         var left = filesize;
@@ -149,6 +163,7 @@ namespace SharpCompress.Test.Zip
                             left -= b;
                         }
                     }
+                }
             }
         }
 
@@ -159,20 +174,26 @@ namespace SharpCompress.Test.Zip
 			Common.Zip.ZipEntry prev = null;
             using (var fs = File.OpenRead(filename))
             using (var rd = ZipReader.Open(fs, new ReaderOptions() { LookForHeader = false }))
+            {
                 while (rd.MoveToNextEntry())
                 {
-					using (rd.OpenEntryStream())
-					{ }
+                    using (rd.OpenEntryStream())
+                    { }
 
                     count++;
-					if (prev != null)
-						size += prev.Size;
-				
-					prev = rd.Entry;
-                }
+                    if (prev != null)
+                    {
+                        size += prev.Size;
+                    }
 
-			if (prev != null)
-				size += prev.Size;
+                    prev = rd.Entry;
+                }
+            }
+
+            if (prev != null)
+            {
+                size += prev.Size;
+            }
 
             return new Tuple<long, long>(count, size);
         }

tests/SharpCompress.Test/Zip/ZipArchiveTests.cs

@@ -401,7 +401,9 @@ namespace SharpCompress.Test.Zip
             ZipArchive a = ZipArchive.Open(unmodified);
             int count = 0;
             foreach (var e in a.Entries)
+            {
                 count++;
+            }
 
             //Prints 3
             Assert.Equal(3, count);
@@ -426,7 +428,9 @@ namespace SharpCompress.Test.Zip
 
             int count3 = 0;
             foreach (var e in a.Entries)
+            {
                 count3++;
+            }
 
             Assert.Equal(3, count3);
         }
@@ -447,7 +451,9 @@ namespace SharpCompress.Test.Zip
                         {
                             using (var memoryStream = new MemoryStream())
                             using (Stream entryStream = entry.OpenEntryStream())
+                            {
                                 entryStream.CopyTo(memoryStream);
+                            }
                         }
                     }
                 }
@@ -507,7 +513,9 @@ namespace SharpCompress.Test.Zip
                         byte[] buf = new byte[bufSize];
                         int bytesRead = 0;
                         while ((bytesRead = entryStream.Read(buf, 0, bufSize)) > 0)
+                        {
                             tempStream.Write(buf, 0, bytesRead);
+                        }
                     }
                 }
             }