From 12b4af3628440fdc62505ed2442486294704290c Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Tue, 15 Apr 2014 19:39:06 +0900
Subject: [PATCH] Fix a few for WebSocket.cs

---
 websocket-sharp/WebSocket.cs | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index 10e74efb..0f1ad645 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -511,26 +511,22 @@ namespace WebSocketSharp
       return true;
     }
 
-    private void acceptException (Exception exception, string reason)
+    private void acceptException (Exception exception, string message)
     {
       var code = CloseStatusCode.Abnormal;
-      var msg = reason;
+      var reason = message;
       if (exception is WebSocketException) {
         var wsex = (WebSocketException) exception;
         code = wsex.Code;
         reason = wsex.Message;
       }
 
-      if (code == CloseStatusCode.Abnormal || code == CloseStatusCode.TlsHandshakeFailure) {
+      if (code == CloseStatusCode.Abnormal || code == CloseStatusCode.TlsHandshakeFailure)
         _logger.Fatal (exception.ToString ());
-        reason = msg;
-      }
-      else {
+      else
         _logger.Error (reason);
-        msg = null;
-      }
 
-      error (msg ?? code.GetMessage ());
+      error (message ?? code.GetMessage ());
       if (_readyState == WebSocketState.Connecting && !_client)
         Close (HttpStatusCode.BadRequest);
       else
@@ -2031,8 +2027,8 @@ namespace WebSocketSharp
                 len));
 
           var sent = len <= FragmentLength
-                   ? send (Opcode.Binary, data)
-                   : send (Opcode.Binary, new MemoryStream (data));
+                     ? send (Opcode.Binary, data)
+                     : send (Opcode.Binary, new MemoryStream (data));
 
           if (completed != null)
             completed (sent);
@@ -2098,10 +2094,10 @@ namespace WebSocketSharp
           }
 
           msg = username.Contains (':') || !username.IsText ()
-              ? "'username' contains an invalid character."
-              : !password.IsNullOrEmpty () && !password.IsText ()
-                ? "'password' contains an invalid character."
-                : null;
+                ? "'username' contains an invalid character."
+                : !password.IsNullOrEmpty () && !password.IsText ()
+                  ? "'password' contains an invalid character."
+                  : null;
         }
 
         if (msg != null) {