don't force unwrap in fixutf

This commit is contained in:
Erik 2015-10-16 12:39:45 -04:00
parent 28ae7a8240
commit aa368f92cf

View File

@ -26,13 +26,15 @@
import Foundation import Foundation
func fixDoubleUTF8(inout name: String) { func fixDoubleUTF8(inout name: String) {
let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)! if let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding),
let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)! latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding) {
name = latin1 as String name = latin1 as String
} }
}
func doubleEncodeUTF8(inout str: String) { func doubleEncodeUTF8(inout str: String) {
let latin1 = str.dataUsingEncoding(NSUTF8StringEncoding)! if let latin1 = str.dataUsingEncoding(NSUTF8StringEncoding),
let utf8 = NSString(data: latin1, encoding: NSISOLatin1StringEncoding)! utf8 = NSString(data: latin1, encoding: NSISOLatin1StringEncoding) {
str = utf8 as String str = utf8 as String
} }
}