diff --git a/Sources/7-Zip/7zFolder.swift b/Sources/7-Zip/7zFolder.swift index 313af4a1..bb764d55 100644 --- a/Sources/7-Zip/7zFolder.swift +++ b/Sources/7-Zip/7zFolder.swift @@ -159,7 +159,7 @@ class SevenZipFolder { let pointerData = DataWithPointer(data: decodedData) - let decoder = try LZMA2Decoder(pointerData) + let decoder = LZMA2Decoder(pointerData) try decoder.setDictionarySize(properties[0]) try decoder.decode() @@ -172,7 +172,7 @@ class SevenZipFolder { else { throw LZMAError.wrongProperties } let pointerData = DataWithPointer(data: decodedData) - let decoder = try LZMADecoder(pointerData) + let decoder = LZMADecoder(pointerData) try decoder.setProperties(properties[0]) decoder.resetStateAndDecoders() @@ -183,7 +183,6 @@ class SevenZipFolder { } decoder.dictionarySize = dictionarySize - // TODO: Make unpackSize (and, probably, other properties) UInt64 and set uncompressed size correctly. decoder.uncompressedSize = unpackSize try decoder.decode() diff --git a/Sources/LZMA/LZMA.swift b/Sources/LZMA/LZMA.swift index 2a4bbc88..82f0d8e4 100644 --- a/Sources/LZMA/LZMA.swift +++ b/Sources/LZMA/LZMA.swift @@ -27,7 +27,7 @@ public class LZMA: DecompressionAlgorithm { } static func decompress(_ pointerData: DataWithPointer, uncompressedSize: UInt64? = nil) throws -> Data { - let decoder = try LZMADecoder(pointerData) + let decoder = LZMADecoder(pointerData) try decoder.setProperties(pointerData.byte()) decoder.resetStateAndDecoders() diff --git a/Sources/LZMA/LZMADecoder.swift b/Sources/LZMA/LZMADecoder.swift index 76202761..47423977 100644 --- a/Sources/LZMA/LZMADecoder.swift +++ b/Sources/LZMA/LZMADecoder.swift @@ -65,7 +65,7 @@ class LZMADecoder { /// Used to select exact variable from 'IsRep', 'IsRepG0', 'IsRepG1' and 'IsRepG2' arrays. private var state = 0 - init(_ pointerData: DataWithPointer) throws { + init(_ pointerData: DataWithPointer) { self.pointerData = pointerData } diff --git a/Sources/LZMA2/LZMA2.swift b/Sources/LZMA2/LZMA2.swift index 6fc1123b..a933a106 100644 --- a/Sources/LZMA2/LZMA2.swift +++ b/Sources/LZMA2/LZMA2.swift @@ -28,7 +28,7 @@ public class LZMA2: DecompressionAlgorithm { } static func decompress(_ pointerData: DataWithPointer) throws -> [UInt8] { - let decoder = try LZMA2Decoder(pointerData) + let decoder = LZMA2Decoder(pointerData) try decoder.setDictionarySize(pointerData.byte()) try decoder.decode() return decoder.out diff --git a/Sources/LZMA2/LZMA2Decoder.swift b/Sources/LZMA2/LZMA2Decoder.swift index 9ce362f7..a08a5d26 100644 --- a/Sources/LZMA2/LZMA2Decoder.swift +++ b/Sources/LZMA2/LZMA2Decoder.swift @@ -14,9 +14,9 @@ class LZMA2Decoder { return self.decoder.out } - init(_ pointerData: DataWithPointer) throws { + init(_ pointerData: DataWithPointer) { self.pointerData = pointerData - self.decoder = try LZMADecoder(pointerData) + self.decoder = LZMADecoder(pointerData) } func setDictionarySize(_ byte: UInt8) throws { diff --git a/Sources/XZ/XZBlock.swift b/Sources/XZ/XZBlock.swift index 73b7f0d8..b0a3f51b 100644 --- a/Sources/XZ/XZBlock.swift +++ b/Sources/XZ/XZBlock.swift @@ -45,7 +45,7 @@ struct XZBlock { /// In case of LZMA2 filters property is a dicitonary size. let filterPropeties = pointerData.byte() let closure = { (dwp: DataWithPointer) -> Data in - let decoder = try LZMA2Decoder(pointerData) + let decoder = LZMA2Decoder(pointerData) try decoder.setDictionarySize(filterPropeties) try decoder.decode()