Resolve most compiler warnings

Bouke · Nov 19, 2017 · a93dfc9 · a93dfc9
1 parent 9e42769
commit a93dfc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Sources/HAP/Base/CharacteristicValueType.swift b/Sources/HAP/Base/CharacteristicValueType.swift
@@ -75,10 +75,6 @@ extension Float: CharacteristicValueType {
 extension Data: CharacteristicValueType, JSONValueTypeConvertible {
     public init?(value: Any) {
         fatalError("How does deserialization of Data work?")
-        guard let data = value as? Data else {
-            return nil
-        }
-        self = data
     }
     static public let format = CharacteristicFormat.data
     public var jsonValueType: JSONValueType {

diff --git a/Sources/HAP/Utils/Data+Extensions.swift b/Sources/HAP/Utils/Data+Extensions.swift
@@ -17,9 +17,9 @@ extension Data {
 extension Data {
     init?(hex: String) {
         var result = [UInt8]()
-        var from = hex.characters.startIndex
-        while from < hex.characters.endIndex {
-            guard let to = hex.characters.index(from, offsetBy: 2, limitedBy: hex.characters.endIndex) else {
+        var from = hex.startIndex
+        while from < hex.endIndex {
+            guard let to = hex.index(from, offsetBy: 2, limitedBy: hex.endIndex) else {
                 return nil
             }
             guard let num = UInt8(hex[from..<to], radix: 16) else {