GitHub/SWCompression
1
0
Fork 0
mirror of https://github.com/tsolomko/SWCompression.git synced 2026-06-23 14:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename some variables for consistency

Browse Source
This commit is contained in:
Timofey Solomko
2017-10-21 13:51:20 +03:00
parent bdfaa3d073
commit 0d3369a4e5
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/7-Zip/7zContainer.swift
+4 -4
View File
@@ -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? {
Sources/TAR/TarContainer.swift
-1
View File
@@ -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 {
Sources/ZIP/ZipContainer.swift
+2 -2
View File
@@ -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