Quellcode durchsuchen

Merge pull request #94 from tannernelson/master

fix non-unwrapped string
Damian Kołakowski vor 10 Jahren
Ursprung
Commit
21d0a36753
3 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 1 1
      Sources/HttpServerIO.swift
  2. 1 1
      Sources/Socket.swift
  3. 1 1
      Sources/String+Misc.swift

+ 1 - 1
Sources/HttpServerIO.swift

@@ -80,7 +80,7 @@ public class HttpServerIO {
     private struct InnerWriteContext: HttpResponseBodyWriter {
         let socket: Socket
         func write(data: [UInt8]) {
-            try? socket.writeUInt8(data)
+            let _ = try? socket.writeUInt8(data)
         }
     }
     

+ 1 - 1
Sources/Socket.swift

@@ -208,4 +208,4 @@ public class Socket: Hashable, Equatable {
 
 public func ==(socket1: Socket, socket2: Socket) -> Bool {
     return socket1.socketFileDescriptor == socket2.socketFileDescriptor
-}
+}

+ 1 - 1
Sources/String+Misc.swift

@@ -41,7 +41,7 @@ extension String {
     
     public static func fromUInt8(array: [UInt8]) -> String {
         #if os(Linux)
-            return String(data: NSData(bytes: array, length: array.count), encoding: NSUTF8StringEncoding)
+            return String(data: NSData(bytes: array, length: array.count), encoding: NSUTF8StringEncoding) ?? ""
         #else
             if let s = String(data: NSData(bytes: array, length: array.count), encoding: NSUTF8StringEncoding) {
                 return s