Merge pull request #212 from kenkendk/remove_unused_code

Removed the unused code to write entries in Zip Headers
adamhathcock · May 30, 2017 · cce9754 · cce9754
2 parents a361d41 + 264aa6d
commit cce9754
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 134 deletions.
diff --git a/src/SharpCompress/Common/Zip/Headers/DirectoryEndHeader.cs b/src/SharpCompress/Common/Zip/Headers/DirectoryEndHeader.cs
@@ -21,18 +21,6 @@ internal override void Read(BinaryReader reader)
             Comment = reader.ReadBytes(CommentLength);
         }
 
-        internal override void Write(BinaryWriter writer)
-        {
-            writer.Write(VolumeNumber);
-            writer.Write(FirstVolumeWithDirectory);
-            writer.Write(TotalNumberOfEntriesInDisk);
-            writer.Write(TotalNumberOfEntries);
-            writer.Write(DirectorySize);
-            writer.Write(DirectoryStartOffsetRelativeToDisk);
-            writer.Write(CommentLength);
-            writer.Write(Comment);
-        }
-
         public ushort VolumeNumber { get; private set; }
 
         public ushort FirstVolumeWithDirectory { get; private set; }

diff --git a/src/SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs b/src/SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs
@@ -61,56 +61,6 @@ internal override void Read(BinaryReader reader)
             }
         }
 
-        internal override void Write(BinaryWriter writer)
-        {
-            var zip64 = CompressedSize >= uint.MaxValue || UncompressedSize >= uint.MaxValue || RelativeOffsetOfEntryHeader >= uint.MaxValue;
-            if (zip64)
-                Version = (ushort)(Version > 45 ? Version : 45);
-
-            writer.Write(Version);
-            writer.Write(VersionNeededToExtract);
-            writer.Write((ushort)Flags);
-            writer.Write((ushort)CompressionMethod);
-            writer.Write(LastModifiedTime);
-            writer.Write(LastModifiedDate);
-            writer.Write(Crc);
-            writer.Write(zip64 ? uint.MaxValue : CompressedSize);
-            writer.Write(zip64 ? uint.MaxValue : UncompressedSize);
-
-            byte[] nameBytes = EncodeString(Name);
-            writer.Write((ushort)nameBytes.Length);
-
-            if (zip64)
-            {
-                writer.Write((ushort)(2 + 2 + 8 + 8 + 8 + 4));
-            }
-            else
-            {
-                //writer.Write((ushort)Extra.Length);
-                writer.Write((ushort)0);
-            }
-            writer.Write((ushort)Comment.Length);
-
-            writer.Write(DiskNumberStart);
-            writer.Write(InternalFileAttributes);
-            writer.Write(ExternalFileAttributes);
-            writer.Write(zip64 ? uint.MaxValue : RelativeOffsetOfEntryHeader);
-
-            writer.Write(nameBytes);
-
-            if (zip64)
-            {
-                writer.Write((ushort)0x0001);
-                writer.Write((ushort)((8 + 8 + 8 + 4)));
-
-                writer.Write((ulong)UncompressedSize);
-                writer.Write((ulong)CompressedSize);
-                writer.Write((ulong)RelativeOffsetOfEntryHeader);
-                writer.Write((uint)0); // VolumeNumber = 0
-            }
-            writer.Write(Comment);
-        }
-
         internal ushort Version { get; private set; }
 
         public ushort VersionNeededToExtract { get; set; }

diff --git a/src/SharpCompress/Common/Zip/Headers/IgnoreHeader.cs b/src/SharpCompress/Common/Zip/Headers/IgnoreHeader.cs
@@ -13,10 +13,5 @@ public IgnoreHeader(ZipHeaderType type)
         internal override void Read(BinaryReader reader)
         {
         }
-
-        internal override void Write(BinaryWriter writer)
-        {
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/src/SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs b/src/SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs
@@ -47,56 +47,6 @@ internal override void Read(BinaryReader reader)
             }
         }
 
-        internal override void Write(BinaryWriter writer)
-        {
-            if (IsZip64)
-                Version = (ushort)(Version > 45 ? Version : 45);
-
-            writer.Write(Version);
-
-            writer.Write((ushort)Flags);
-            writer.Write((ushort)CompressionMethod);
-            writer.Write(LastModifiedTime);
-            writer.Write(LastModifiedDate);
-            writer.Write(Crc);
-
-            if (IsZip64)
-            {
-                writer.Write(uint.MaxValue);
-                writer.Write(uint.MaxValue);
-            }
-            else
-            {
-                writer.Write(CompressedSize);
-                writer.Write(UncompressedSize);
-            }
-
-            byte[] nameBytes = EncodeString(Name);
-
-            writer.Write((ushort)nameBytes.Length);
-            if (IsZip64)
-            {
-                writer.Write((ushort)(2 + 2 + (2 * 8)));
-            }
-            else
-            {
-                writer.Write((ushort)0);
-            }
-
-            //if (Extra != null)
-            //{
-            //    writer.Write(Extra);
-            //}
-            writer.Write(nameBytes);
-            if (IsZip64)
-            {
-                writer.Write((ushort)0x0001);
-                writer.Write((ushort)(2 * 8));
-                writer.Write((ulong)CompressedSize);
-                writer.Write((ulong)UncompressedSize);
-            }
-        }
-
         internal ushort Version { get; private set; }
     }
 }
diff --git a/src/SharpCompress/Common/Zip/Headers/SplitHeader.cs b/src/SharpCompress/Common/Zip/Headers/SplitHeader.cs
@@ -14,10 +14,5 @@ internal override void Read(BinaryReader reader)
         {
             throw new NotImplementedException();
         }
-
-        internal override void Write(BinaryWriter writer)
-        {
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndHeader.cs b/src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndHeader.cs
@@ -26,11 +26,6 @@ internal override void Read(BinaryReader reader)
 
         const int SizeOfFixedHeaderDataExceptSignatureAndSizeFields = 44;
 
-        internal override void Write(BinaryWriter writer)
-        {
-            throw new NotImplementedException();
-        }
-
         public long SizeOfDirectoryEndRecord { get; private set; }
 
         public ushort VersionMadeBy { get; private set; }

diff --git a/src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndLocatorHeader.cs b/src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndLocatorHeader.cs
@@ -16,11 +16,6 @@ internal override void Read(BinaryReader reader)
             TotalNumberOfVolumes = reader.ReadUInt32();
         }
 
-        internal override void Write(BinaryWriter writer)
-        {
-            throw new System.NotImplementedException();
-        }
-
         public uint FirstVolumeWithDirectory { get; private set; }
 
         public long RelativeOffsetOfTheEndOfDirectoryRecord { get; private set; }

diff --git a/src/SharpCompress/Common/Zip/Headers/ZipHeader.cs b/src/SharpCompress/Common/Zip/Headers/ZipHeader.cs
@@ -14,8 +14,6 @@ protected ZipHeader(ZipHeaderType type)
 
         internal abstract void Read(BinaryReader reader);
 
-        internal abstract void Write(BinaryWriter writer);
-
         internal bool HasData { get; set; }
     }
 }