Move ReadExactly from duplicate StreamExtension class

CollapseLauncher · Oct 29, 2023 · 4efe91e · 4efe91e
1 parent 5fe6205
commit 4efe91e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/Hi3Helper.SharpHDiffPatch/Binary/StreamExtensions.cs b/Hi3Helper.SharpHDiffPatch/Binary/StreamExtensions.cs
@@ -4,10 +4,24 @@
 
 namespace Hi3Helper.SharpHDiffPatch
 {
-    public static class StreamExtensions
+    public static class StreamExtension
     {
         private static byte[] StringBuffer = new byte[4 << 10];
 
+        public static int ReadExactly(this Stream stream, byte[] buffer, int offset, int count)
+        {
+            int totalRead = 0;
+            while (totalRead < buffer.Length)
+            {
+                int read = stream.Read(buffer, offset, count);
+                if (read == 0) return totalRead;
+
+                totalRead += read;
+            }
+
+            return totalRead;
+        }
+
         public static string ReadStringToNull(this Stream reader)
         {
             int currentValue;

diff --git a/Hi3Helper.SharpHDiffPatch/PatchCore/PatchCore.cs b/Hi3Helper.SharpHDiffPatch/PatchCore/PatchCore.cs
@@ -31,25 +31,6 @@ internal struct CoverHeader
         internal RLERefClipStruct[] rleRefStruct;
     }
 
-#if !NET7_0_OR_GREATER
-    internal static class StreamExtension
-    {
-        public static int ReadExactly(this Stream stream, byte[] buffer, int offset, int count)
-        {
-            int totalRead = 0;
-            while (totalRead < buffer.Length)
-            {
-                int read = stream.Read(buffer, offset, count);
-                if (read == 0) return totalRead;
-
-                totalRead += read;
-            }
-
-            return totalRead;
-        }
-    }
-#endif
-
     internal interface IPatchCore
     {
         void SetTDirPatcher(TDirPatcher input);