From 6bdf2365fc87dab1a44abafbd3680fb9f1df16e9 Mon Sep 17 00:00:00 2001
From: Jason Nelson <jason@carbonmade.com>
Date: Thu, 30 Jul 2020 16:45:38 -0700
Subject: [PATCH] Inline variable declarations

---
 .../Common/SevenZip/ArchiveReader.cs          | 25 ++++++-------------
 src/SharpCompress/Utility.cs                  |  6 ++---
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/SharpCompress/Common/SevenZip/ArchiveReader.cs b/src/SharpCompress/Common/SevenZip/ArchiveReader.cs
index bc5aad59..c4887eb4 100644
--- a/src/SharpCompress/Common/SevenZip/ArchiveReader.cs
+++ b/src/SharpCompress/Common/SevenZip/ArchiveReader.cs
@@ -791,22 +791,14 @@ namespace SharpCompress.Common.SevenZip
 #endif
             try
             {
-                long dataStartPos;
-                List<long> packSizes;
-                List<uint?> packCrCs;
-                List<CFolder> folders;
-                List<int> numUnpackStreamsInFolders;
-                List<long> unpackSizes;
-                List<uint?> digests;
-
                 ReadStreamsInfo(null,
-                                out dataStartPos,
-                                out packSizes,
-                                out packCrCs,
-                                out folders,
-                                out numUnpackStreamsInFolders,
-                                out unpackSizes,
-                                out digests);
+                                out long dataStartPos,
+                                out List<long> packSizes,
+                                out List<uint?> packCrCs,
+                                out List<CFolder> folders,
+                                out List<int> numUnpackStreamsInFolders,
+                                out List<long> unpackSizes,
+                                out List<uint?> digests);
 
                 dataStartPos += baseOffset;
 
@@ -1445,8 +1437,7 @@ namespace SharpCompress.Common.SevenZip
 
         private Stream GetCachedDecoderStream(ArchiveDatabase db, int folderIndex)
         {
-            Stream s;
-            if (!_cachedStreams.TryGetValue(folderIndex, out s))
+            if (!_cachedStreams.TryGetValue(folderIndex, out Stream s))
             {
                 CFolder folderInfo = db._folders[folderIndex];
                 int packStreamIndex = db._folders[folderIndex]._firstPackStreamId;
diff --git a/src/SharpCompress/Utility.cs b/src/SharpCompress/Utility.cs
index 30d59362..e3de66e6 100644
--- a/src/SharpCompress/Utility.cs
+++ b/src/SharpCompress/Utility.cs
@@ -235,9 +235,8 @@ namespace SharpCompress
             byte[] array = GetTransferByteArray();
             try
             {
-                int count;
                 long total = 0;
-                while (ReadTransferBlock(source, array, out count))
+                while (ReadTransferBlock(source, array, out int count))
                 {
                     total += count;
                     destination.Write(array, 0, count);
@@ -255,10 +254,9 @@ namespace SharpCompress
             byte[] array = GetTransferByteArray();
             try
             {
-                int count;
                 var iterations = 0;
                 long total = 0;
-                while (ReadTransferBlock(source, array, out count))
+                while (ReadTransferBlock(source, array, out int count))
                 {
                     total += count;
                     destination.Write(array, 0, count);