Jelajahi Sumber

Fixed all warnings happened after an upgrade to swift-DEVELOPMENT-SNAPSHOT-2016-03-01-a-osx.pkg.

Damian Kołakowski 10 tahun lalu
induk
melakukan
a708f9bfb9
4 mengubah file dengan 8 tambahan dan 8 penghapusan
  1. 1 1
      Sources/File.swift
  2. 3 3
      Sources/HttpRequest.swift
  3. 2 2
      Sources/HttpRouter.swift
  4. 2 2
      Sources/SQLite.swift

+ 1 - 1
Sources/File.swift

@@ -71,7 +71,7 @@ public class File {
         fclose(pointer)
         fclose(pointer)
     }
     }
     
     
-    public func read(inout data: [UInt8]) throws -> Int {
+    public func read(data: inout [UInt8]) throws -> Int {
         if data.count <= 0 {
         if data.count <= 0 {
             return data.count
             return data.count
         }
         }

+ 3 - 3
Sources/HttpRequest.swift

@@ -102,7 +102,7 @@ public class HttpRequest {
         return result
         return result
     }
     }
     
     
-    private func nextMultiPart(inout generator: IndexingGenerator<[UInt8]>, boundary: String, isFirst: Bool) -> MultiPart? {
+    private func nextMultiPart(generator: inout IndexingGenerator<[UInt8]>, boundary: String, isFirst: Bool) -> MultiPart? {
         if isFirst {
         if isFirst {
             guard nextMultiPartLine(&generator) == boundary else {
             guard nextMultiPartLine(&generator) == boundary else {
                 return nil
                 return nil
@@ -123,7 +123,7 @@ public class HttpRequest {
         return MultiPart(headers: headers, body: body)
         return MultiPart(headers: headers, body: body)
     }
     }
     
     
-    private func nextMultiPartLine(inout generator: IndexingGenerator<[UInt8]>) -> String? {
+    private func nextMultiPartLine(generator: inout IndexingGenerator<[UInt8]>) -> String? {
         var result = String()
         var result = String()
         while let value = generator.next() {
         while let value = generator.next() {
             if value > HttpRequest.CR {
             if value > HttpRequest.CR {
@@ -139,7 +139,7 @@ public class HttpRequest {
     static let CR = UInt8(13)
     static let CR = UInt8(13)
     static let NL = UInt8(10)
     static let NL = UInt8(10)
     
     
-    private func nextMultiPartBody(inout generator: IndexingGenerator<[UInt8]>, boundary: String) -> [UInt8]? {
+    private func nextMultiPartBody(generator: inout IndexingGenerator<[UInt8]>, boundary: String) -> [UInt8]? {
         var body = [UInt8]()
         var body = [UInt8]()
         let boundaryArray = [UInt8](boundary.utf8)
         let boundaryArray = [UInt8](boundary.utf8)
         var matchOffset = 0;
         var matchOffset = 0;

+ 2 - 2
Sources/HttpRouter.swift

@@ -64,7 +64,7 @@ public class HttpRouter {
         return nil
         return nil
     }
     }
     
     
-    private func inflate(inout node: Node, inout generator: IndexingGenerator<[String]>) -> Node {
+    private func inflate(node: inout Node, generator: inout IndexingGenerator<[String]>) -> Node {
         if let pathSegment = generator.next() {
         if let pathSegment = generator.next() {
             if let _ = node.nodes[pathSegment] {
             if let _ = node.nodes[pathSegment] {
                 return inflate(&node.nodes[pathSegment]!, generator: &generator)
                 return inflate(&node.nodes[pathSegment]!, generator: &generator)
@@ -76,7 +76,7 @@ public class HttpRouter {
         return node
         return node
     }
     }
     
     
-    private func findHandler(inout node: Node, inout params: [String: String], inout generator: IndexingGenerator<[String]>) -> (HttpRequest -> HttpResponse)? {
+    private func findHandler(node: inout Node, params: inout [String: String], generator: inout IndexingGenerator<[String]>) -> (HttpRequest -> HttpResponse)? {
         guard let pathToken = generator.next() else {
         guard let pathToken = generator.next() else {
             return node.handler
             return node.handler
         }
         }

+ 2 - 2
Sources/SQLite.swift

@@ -62,8 +62,8 @@ public class SQLite {
     
     
     public func enumerate(sql: String) throws -> StatmentSequence {
     public func enumerate(sql: String) throws -> StatmentSequence {
         var statement = COpaquePointer()
         var statement = COpaquePointer()
-        let prepeareResult = sql.withCString { sqlite3_prepare_v2(databaseConnection, $0, Int32(sql.utf8.count), &statement, nil) }
-        guard prepeareResult == SQLITE_OK else {
+        let prepareResult = sql.withCString { sqlite3_prepare_v2(databaseConnection, $0, Int32(sql.utf8.count), &statement, nil) }
+        guard prepareResult == SQLITE_OK else {
             throw SQLiteError.ExecFailed(String.fromCString(sqlite3_errmsg(databaseConnection)))
             throw SQLiteError.ExecFailed(String.fromCString(sqlite3_errmsg(databaseConnection)))
         }
         }
         return StatmentSequence(statement: statement)
         return StatmentSequence(statement: statement)