#154 Improve Embedded Swift support

PureSwift · Nov 8, 2024 · 98fec71 · 98fec71
1 parent d3adea7
commit 98fec71
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/Sources/Bluetooth/Extensions/String.swift b/Sources/Bluetooth/Extensions/String.swift
@@ -21,7 +21,7 @@ internal extension String {
             #if canImport(Foundation)
             self.init(bytes: data, encoding: .utf8)
             #else
-            #error("Darwin should have Foundation framework")
+            fatalError()
             #endif
         }
     }
@@ -45,8 +45,3 @@ internal extension String {
     }
     #endif
 }
-
-#if hasFeature(Embedded)
-@_silgen_name("snprintf")
-internal func _snprintf_uint8_t(_ pointer: UnsafeMutablePointer<CChar>, _ length: Int, _ format: UnsafePointer<CChar>, _ arg: UInt8) -> Int32
-#endif
diff --git a/Sources/Bluetooth/Extensions/System.swift b/Sources/Bluetooth/Extensions/System.swift
@@ -17,18 +17,25 @@ import Musl
 import WASILibc
 #elseif canImport(Bionic)
 import Bionic
-#else
-#error("Unsupported Platform")
 #endif
 
 // Declares the required C functions
+#if hasFeature(Embedded)
+@_silgen_name("memcmp")
+internal func _memcmp(
+    _ p1: UnsafeRawPointer?,
+    _ p2: UnsafeRawPointer?,
+    _ size: Int
+) -> Int32
+#else
 internal func _memcmp(
     _ p1: UnsafeRawPointer?,
     _ p2: UnsafeRawPointer?,
     _ size: Int
 ) -> Int32 {
     memcmp(p1, p2, size)
 }
+#endif
 
 #if hasFeature(Embedded)
 @_silgen_name("snprintf")

diff --git a/Sources/Bluetooth/Extensions/UUID.swift b/Sources/Bluetooth/Extensions/UUID.swift
@@ -116,7 +116,7 @@ extension _UUID {
     @inline(__always)
     internal func withUUIDBytes<R>(_ work: (UnsafeBufferPointer<UInt8>) throws -> R) rethrows -> R {
         return try withExtendedLifetime(self) {
-            try withUnsafeBytes(of: uuid) { rawBuffer in
+            try Swift.withUnsafeBytes(of: uuid) { rawBuffer in
                 return try rawBuffer.withMemoryRebound(to: UInt8.self) { buffer in
                     return try work(buffer)
                 }
@@ -143,8 +143,8 @@ extension _UUID {
 extension _UUID: Equatable {
 
     public static func ==(lhs: _UUID, rhs: _UUID) -> Bool {
-        withUnsafeBytes(of: lhs) { lhsPtr in
-            withUnsafeBytes(of: rhs) { rhsPtr in
+        Swift.withUnsafeBytes(of: lhs) { lhsPtr in
+            Swift.withUnsafeBytes(of: rhs) { rhsPtr in
                 let lhsTuple = lhsPtr.loadUnaligned(as: (UInt64, UInt64).self)
                 let rhsTuple = rhsPtr.loadUnaligned(as: (UInt64, UInt64).self)
                 return (lhsTuple.0 ^ rhsTuple.0) | (lhsTuple.1 ^ rhsTuple.1) == 0
@@ -156,7 +156,7 @@ extension _UUID: Equatable {
 extension _UUID: Hashable {
 
     public func hash(into hasher: inout Hasher) {
-        withUnsafeBytes(of: uuid) { buffer in
+        Swift.withUnsafeBytes(of: uuid) { buffer in
             hasher.combine(bytes: buffer)
         }
     }
@@ -211,8 +211,8 @@ extension _UUID : Comparable {
         var rightUUID = rhs.uuid
         var result: Int = 0
         var diff: Int = 0
-        withUnsafeBytes(of: &leftUUID) { leftPtr in
-            withUnsafeBytes(of: &rightUUID) { rightPtr in
+        Swift.withUnsafeBytes(of: &leftUUID) { leftPtr in
+            Swift.withUnsafeBytes(of: &rightUUID) { rightPtr in
                 for offset in (0 ..< MemoryLayout<ByteValue>.size).reversed() {
                     diff = Int(leftPtr.load(fromByteOffset: offset, as: UInt8.self)) -
                         Int(rightPtr.load(fromByteOffset: offset, as: UInt8.self))