From da58379dfa01817f8f84d7cb3a4cbf1df6316dfd Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Wed, 6 Jun 2018 10:54:39 -0400 Subject: [PATCH] refactor: Tidying --- ICD.Common.Utils/IO/Compression/IcdZip.cs | 14 +++++++------- ICD.Common.Utils/IO/IcdStream.cs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ICD.Common.Utils/IO/Compression/IcdZip.cs b/ICD.Common.Utils/IO/Compression/IcdZip.cs index 39bc1f3..2e10201 100644 --- a/ICD.Common.Utils/IO/Compression/IcdZip.cs +++ b/ICD.Common.Utils/IO/Compression/IcdZip.cs @@ -90,7 +90,7 @@ namespace ICD.Common.Utils.IO.Compression if (stream.Length < 22) yield break; - stream.Seek(-22, eSeekOrigin.End.ToSeekOrigin()); + stream.Seek(-22, eSeekOrigin.End); // find directory signature while (reader.ReadInt32() != DIRECTORY_SIGNATURE) @@ -99,15 +99,15 @@ namespace ICD.Common.Utils.IO.Compression yield break; // move 1 byte back - stream.Seek(-5, eSeekOrigin.Current.ToSeekOrigin()); + stream.Seek(-5, eSeekOrigin.Current); } // read directory properties - stream.Seek(6, eSeekOrigin.Current.ToSeekOrigin()); + stream.Seek(6, eSeekOrigin.Current); ushort entries = reader.ReadUInt16(); int difSize = reader.ReadInt32(); uint dirOffset = reader.ReadUInt32(); - stream.Seek(dirOffset, eSeekOrigin.Begin.ToSeekOrigin()); + stream.Seek(dirOffset, eSeekOrigin.Begin); // read directory entries for (int i = 0; i < entries; i++) @@ -130,7 +130,7 @@ namespace ICD.Common.Utils.IO.Compression reader.ReadInt32(); int fileHeaderOffset = reader.ReadInt32(); byte[] fileNameBytes = reader.ReadBytes(fileNameSize); - stream.Seek(extraSize, eSeekOrigin.Current.ToSeekOrigin()); + stream.Seek(extraSize, eSeekOrigin.Current); byte[] fileCommentBytes = reader.ReadBytes(commentSize); int fileDataOffset = CalculateFileDataOffset(stream, reader, fileHeaderOffset); @@ -157,12 +157,12 @@ namespace ICD.Common.Utils.IO.Compression private static int CalculateFileDataOffset(IcdStream stream, IcdBinaryReader reader, int fileHeaderOffset) { long position = stream.Position; - stream.Seek(fileHeaderOffset + 26, eSeekOrigin.Begin.ToSeekOrigin()); + stream.Seek(fileHeaderOffset + 26, eSeekOrigin.Begin); short fileNameSize = reader.ReadInt16(); short extraSize = reader.ReadInt16(); int fileOffset = (int)stream.Position + fileNameSize + extraSize; - stream.Seek(position, eSeekOrigin.Begin.ToSeekOrigin()); + stream.Seek(position, eSeekOrigin.Begin); return fileOffset; } diff --git a/ICD.Common.Utils/IO/IcdStream.cs b/ICD.Common.Utils/IO/IcdStream.cs index 9694d04..56cb11b 100644 --- a/ICD.Common.Utils/IO/IcdStream.cs +++ b/ICD.Common.Utils/IO/IcdStream.cs @@ -34,9 +34,9 @@ namespace ICD.Common.Utils.IO m_Stream.Dispose(); } - public void Seek(long offset, SeekOrigin end) + public void Seek(long offset, eSeekOrigin seekOrigin) { - m_Stream.Seek(offset, end); + m_Stream.Seek(offset, seekOrigin.ToSeekOrigin()); } } }