From bca275f3aa9cdf90a675bf9c8c252fcda8e78c19 Mon Sep 17 00:00:00 2001 From: Timofey Solomko Date: Sun, 29 Oct 2017 12:37:28 +0300 Subject: [PATCH] Remove label from the argument of setProperties function --- Sources/7-Zip/7zFolder.swift | 2 +- Sources/LZMA/LZMA.swift | 2 +- Sources/LZMA/LZMA2Decoder.swift | 7 +++---- Sources/LZMA/LZMATempDecoder.swift | 2 +- Sources/ZIP/ZipContainer.swift | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Sources/7-Zip/7zFolder.swift b/Sources/7-Zip/7zFolder.swift index fe8ab8af..e77598f7 100644 --- a/Sources/7-Zip/7zFolder.swift +++ b/Sources/7-Zip/7zFolder.swift @@ -170,7 +170,7 @@ class SevenZipFolder { let pointerData = DataWithPointer(data: decodedData) let decoder = try LZMATempDecoder(pointerData) - try decoder.setProperties(from: properties[0]) + try decoder.setProperties(properties[0]) decoder.resetStateAndDecoders() var dictionarySize = 0 diff --git a/Sources/LZMA/LZMA.swift b/Sources/LZMA/LZMA.swift index 2e3ff5bb..5519d0e9 100644 --- a/Sources/LZMA/LZMA.swift +++ b/Sources/LZMA/LZMA.swift @@ -30,7 +30,7 @@ public class LZMA: DecompressionAlgorithm { static func decompress(_ pointerData: DataWithPointer) throws -> [UInt8] { let decoder = try LZMATempDecoder(pointerData) - try decoder.setProperties(from: pointerData.byte()) + try decoder.setProperties(pointerData.byte()) decoder.resetStateAndDecoders() decoder.dictionarySize = pointerData.uint32().toInt() diff --git a/Sources/LZMA/LZMA2Decoder.swift b/Sources/LZMA/LZMA2Decoder.swift index 1329c908..afe1a199 100644 --- a/Sources/LZMA/LZMA2Decoder.swift +++ b/Sources/LZMA/LZMA2Decoder.swift @@ -50,8 +50,7 @@ class LZMA2Decoder { case 0x80...0xFF: try self.dispatch(controlByte) default: - // TODO: Message. - fatalError("") + fatalError("Incorrect control byte.") // This statement is never executed. } } } @@ -70,11 +69,11 @@ class LZMA2Decoder { case 1: self.decoder.resetStateAndDecoders() case 2: - try self.decoder.setProperties(from: pointerData.byte()) + try self.decoder.setProperties(pointerData.byte()) self.decoder.resetStateAndDecoders() dataStartIndex += 1 case 3: - try self.decoder.setProperties(from: pointerData.byte()) + try self.decoder.setProperties(pointerData.byte()) self.decoder.resetStateAndDecoders() dataStartIndex += 1 self.decoder.resetDictionary() diff --git a/Sources/LZMA/LZMATempDecoder.swift b/Sources/LZMA/LZMATempDecoder.swift index ff866ea2..d91a8d98 100644 --- a/Sources/LZMA/LZMATempDecoder.swift +++ b/Sources/LZMA/LZMATempDecoder.swift @@ -77,7 +77,7 @@ class LZMATempDecoder { - Important: `resetStateAndDecoders` should always be called afterwards. */ - func setProperties(from byte: UInt8) throws { + func setProperties(_ byte: UInt8) throws { guard byte < 9 * 5 * 5 else { throw LZMAError.wrongProperties } /// The number of literal context bits diff --git a/Sources/ZIP/ZipContainer.swift b/Sources/ZIP/ZipContainer.swift index ad3f2a9c..2c4cace2 100644 --- a/Sources/ZIP/ZipContainer.swift +++ b/Sources/ZIP/ZipContainer.swift @@ -84,7 +84,7 @@ public class ZipContainer: Container { let decoder = try LZMATempDecoder(pointerData) - try decoder.setProperties(from: pointerData.byte()) + try decoder.setProperties(pointerData.byte()) decoder.resetStateAndDecoders() decoder.dictionarySize = pointerData.uint32().toInt()