From 88c139ed0c104e63230d08f222f1b09298b7db56 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Thu, 7 May 2015 10:32:30 -0400
Subject: [PATCH] clean up

---
 SocketIOClientSwift/SocketEngine.swift   |  8 ----
 SocketIOClientSwift/SocketIOClient.swift | 52 +++++++++++-------------
 SocketIOClientSwift/SocketPacket.swift   |  3 +-
 3 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift
index 2e998a5..cb6861f 100644
--- a/SocketIOClientSwift/SocketEngine.swift
+++ b/SocketIOClientSwift/SocketEngine.swift
@@ -493,15 +493,11 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
             }
         } else if type == PacketType.NOOP {
             self.doPoll()
-            return
         } else if type == PacketType.PONG {
             // We should upgrade
             if message == "3probe" {
                 self.upgradeTransport()
-                return
             }
-            
-            return
         } else if type == PacketType.OPEN {
             var err:NSError?
             
@@ -531,8 +527,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
             if !self.forceWebsockets {
                 self.doPoll()
             }
-            
-            return
         } else if type == PacketType.CLOSE {
             if self.client == nil {
                 return
@@ -541,8 +535,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
             if self.polling {
                 self.client!.engineDidClose("Disconnect")
             }
-            
-            return
         } else if message.hasPrefix("b4") {
             // binary in base64 string
             message.removeRange(Range<String.Index>(start: message.startIndex,
diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift
index 1cd9377..8755c73 100644
--- a/SocketIOClientSwift/SocketIOClient.swift
+++ b/SocketIOClientSwift/SocketIOClient.swift
@@ -89,40 +89,36 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
         self.opts = opts
         
         // Set options
-        if opts != nil {
-            if let sessionDelegate = opts!["sessionDelegate"] as? NSURLSessionDelegate {
-                self.sessionDelegate = sessionDelegate
+        if let sessionDelegate = opts?["sessionDelegate"] as? NSURLSessionDelegate {
+            self.sessionDelegate = sessionDelegate
+        }
+        
+        if let log = opts?["log"] as? Bool {
+            self.log = log
+        }
+        
+        if var nsp = opts?["nsp"] as? String {
+            if nsp != "/" && nsp.hasPrefix("/") {
+                nsp.removeAtIndex(nsp.startIndex)
             }
             
-            if let log = opts!["log"] as? Bool {
-                self.log = log
-            }
-            
-            if var nsp = opts!["nsp"] as? String {
-                if nsp != "/" && nsp.hasPrefix("/") {
-                    nsp.removeAtIndex(nsp.startIndex)
-                }
-                
-                self.nsp = nsp
-            }
-            
-            if let reconnects = opts!["reconnects"] as? Bool {
-                self.reconnects = reconnects
-            }
-            
-            if let reconnectAttempts = opts!["reconnectAttempts"] as? Int {
-                self.reconnectAttempts = reconnectAttempts
-            } else {
-                self.reconnectAttempts = -1
-            }
-            
-            if let reconnectWait = opts!["reconnectWait"] as? Int {
-                self.reconnectWait = abs(reconnectWait)
-            }
+            self.nsp = nsp
+        }
+        
+        if let reconnects = opts?["reconnects"] as? Bool {
+            self.reconnects = reconnects
+        }
+        
+        if let reconnectAttempts = opts?["reconnectAttempts"] as? Int {
+            self.reconnectAttempts = reconnectAttempts
         } else {
             self.reconnectAttempts = -1
         }
         
+        if let reconnectWait = opts?["reconnectWait"] as? Int {
+            self.reconnectWait = abs(reconnectWait)
+        }
+        
         super.init()
     }
     
diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift
index 6679d64..aa1baa3 100644
--- a/SocketIOClientSwift/SocketPacket.swift
+++ b/SocketIOClientSwift/SocketPacket.swift
@@ -94,7 +94,6 @@ final class SocketPacket: Printable {
     
     func createMessageForEvent(event:String) -> String {
         let message:String
-        var jsonSendError:NSError?
         
         if self.binary.count == 0 {
             self.type = PacketType.EVENT
@@ -157,7 +156,7 @@ final class SocketPacket: Printable {
         return self.completeMessage(msg, ack: true)
     }
     
-    func completeMessage(var message:String, ack:Bool = false) -> String {
+    private func completeMessage(var message:String, ack:Bool = false) -> String {
         var err:NSError?
         
         if self.data == nil || self.data!.count == 0 {