Remove throws keyword from LZMA decoders inits

This commit is contained in:
Timofey Solomko
2017-11-11 13:10:35 +03:00
parent 1164d8eafb
commit f181bd6e3d
6 changed files with 8 additions and 9 deletions
+2 -3
View File
@@ -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()
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 {
+1 -1
View File
@@ -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()