Forráskód Böngészése

while true { } loops replaced by while case.

Damian Kołakowski 10 éve
szülő
commit
548519aed2
2 módosított fájl, 4 hozzáadás és 11 törlés
  1. 1 5
      Sources/File.swift
  2. 3 6
      Sources/HttpParser.swift

+ 1 - 5
Sources/File.swift

@@ -74,11 +74,7 @@ public class File {
         }
         defer { closedir(dir) }
         var results = [String]()
-        while true {
-            let ent = readdir(dir)
-            if ent == nil {
-                break
-            }
+        while case let ent = readdir(dir) where ent != nil {
             var name = ent.memory.d_name
             let fileName = withUnsafePointer(&name) { (ptr) -> String? in
                 #if os(Linux)

+ 3 - 6
Sources/HttpParser.swift

@@ -57,16 +57,13 @@ public class HttpParser {
     
     private func readHeaders(socket: Socket) throws -> [String: String] {
         var headers = [String: String]()
-        repeat {
-            let headerLine = try socket.readLine()
-            if headerLine.isEmpty {
-                return headers
-            }
+        while case let headerLine = try socket.readLine() where !headerLine.isEmpty {
             let headerTokens = headerLine.split(1, separator: ":")
             if let name = headerTokens.first, value = headerTokens.last {
                 headers[name.lowercaseString] = value.trim()
             }
-        } while true
+        }
+        return headers
     }
     
     func supportsKeepAlive(headers: [String: String]) -> Bool {