From 0d3369a4e5da4d0314e36de4b68499f1affb3a4d Mon Sep 17 00:00:00 2001
From: Timofey Solomko <tsolomko@gmail.com>
Date: Sat, 21 Oct 2017 13:47:44 +0300
Subject: [PATCH] Rename some variables for consistency

---
 Sources/7-Zip/7zContainer.swift | 8 ++++----
 Sources/TAR/TarContainer.swift  | 1 -
 Sources/ZIP/ZipContainer.swift  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Sources/7-Zip/7zContainer.swift b/Sources/7-Zip/7zContainer.swift
index 1ee3b4e8..6a683caa 100644
--- a/Sources/7-Zip/7zContainer.swift
+++ b/Sources/7-Zip/7zContainer.swift
@@ -197,7 +197,7 @@ public class SevenZipContainer {
      - Returns: Array of `SevenZipEntryInfo`.
      */
     public static func info(container data: Data) throws -> [SevenZipEntryInfo] {
-        var entryInfos = [SevenZipEntryInfo]()
+        var entries = [SevenZipEntryInfo]()
         guard let header = try readHeader(data)
             else { return [] }
 
@@ -207,17 +207,17 @@ public class SevenZipContainer {
         var nonEmptyFileIndex = 0
         for file in files {
             if !file.isEmptyStream, let substreamInfo = header.mainStreams?.substreamInfo {
-                entryInfos.append(SevenZipEntryInfo(file,
+                entries.append(SevenZipEntryInfo(file,
                                                     substreamInfo.unpackSizes[nonEmptyFileIndex],
                                                     substreamInfo.digests[nonEmptyFileIndex]))
                 nonEmptyFileIndex += 1
             } else {
                 let info = file.isEmptyFile ? SevenZipEntryInfo(file, 0) : SevenZipEntryInfo(file)
-                entryInfos.append(info)
+                entries.append(info)
             }
         }
 
-        return entryInfos
+        return entries
     }
 
     private static func readHeader(_ data: Data) throws -> SevenZipHeader? {
diff --git a/Sources/TAR/TarContainer.swift b/Sources/TAR/TarContainer.swift
index d0e9f1b5..dc4755de 100644
--- a/Sources/TAR/TarContainer.swift
+++ b/Sources/TAR/TarContainer.swift
@@ -24,7 +24,6 @@ public class TarContainer: Container {
      */
     public static func open(container data: Data) throws -> [TarEntry] {
         let infos = try info(container: data)
-
         var entries = [TarEntry]()
 
         for infoEntry in infos {
diff --git a/Sources/ZIP/ZipContainer.swift b/Sources/ZIP/ZipContainer.swift
index e92ae5fb..564833ab 100644
--- a/Sources/ZIP/ZipContainer.swift
+++ b/Sources/ZIP/ZipContainer.swift
@@ -29,8 +29,8 @@ public class ZipContainer: Container {
         var entries = [ZipEntry]()
 
         for infoEntry in infos {
-            let data = try ZipContainer.getEntryData(from: data, using: infoEntry)
-            entries.append(ZipEntry(infoEntry, data))
+            let entryData = try ZipContainer.getEntryData(from: data, using: infoEntry)
+            entries.append(ZipEntry(infoEntry, entryData))
         }
 
         return entries