running code clean up

James-Frowen · Sep 23, 2024 · ac069f9 · ac069f9
1 parent 837b6e8
commit ac069f9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/source/Runtime/Client/StandAlone/ClientSslHelper.cs b/source/Runtime/Client/StandAlone/ClientSslHelper.cs
@@ -6,9 +6,9 @@
 
 namespace JamesFrowen.SimpleWeb
 {
-    internal class ClientSslHelper
+    class ClientSslHelper
     {
-        private readonly bool allowErrors;
+        readonly bool allowErrors;
 
         public ClientSslHelper(bool allowErrors)
         {
@@ -38,7 +38,7 @@ internal bool TryCreateStream(Connection conn, Uri uri)
 
         Stream CreateStream(NetworkStream stream, Uri uri)
         {
-            var sslStream = new SslStream(stream, true, ValidateServerCertificate);
+            SslStream sslStream = new SslStream(stream, true, ValidateServerCertificate);
             sslStream.AuthenticateAsClient(uri.Host);
             return sslStream;
         }
@@ -56,7 +56,7 @@ bool ValidateServerCertificate(object sender, X509Certificate certificate, X509C
             }
 
             // Do not allow this client to communicate with unauthenticated servers.
-            return false; 
+            return false;
         }
     }
 }
diff --git a/source/Runtime/Client/StandAlone/WebSocketClientStandAlone.cs b/source/Runtime/Client/StandAlone/WebSocketClientStandAlone.cs
@@ -27,13 +27,13 @@ public override void Connect(Uri serverAddress)
             state = ClientState.Connecting;
 
             // create connection here before thread so that send queue exist before connected
-            var client = new TcpClient();
+            TcpClient client = new TcpClient();
             tcpConfig.ApplyTo(client);
 
             // create connection object here so dispose correctly disconnects on failed connect
             conn = new Connection(client, AfterConnectionDisposed);
 
-            var receiveThread = new Thread(() => ConnectAndReceiveLoop(serverAddress));
+            Thread receiveThread = new Thread(() => ConnectAndReceiveLoop(serverAddress));
             receiveThread.IsBackground = true;
             receiveThread.Start();
         }
@@ -79,9 +79,9 @@ void ConnectAndReceiveLoop(Uri serverAddress)
 
                 receiveQueue.Enqueue(new Message(EventType.Connected));
 
-                var sendThread = new Thread(() =>
+                Thread sendThread = new Thread(() =>
                 {
-                    var sendConfig = new SendLoop.Config(
+                    SendLoop.Config sendConfig = new SendLoop.Config(
                         conn,
                         bufferSize: Constants.HeaderSize + Constants.MaskSize + maxMessageSize,
                         setMask: true);
@@ -93,7 +93,7 @@ void ConnectAndReceiveLoop(Uri serverAddress)
                 sendThread.IsBackground = true;
                 sendThread.Start();
 
-                var config = new ReceiveLoop.Config(conn,
+                ReceiveLoop.Config config = new ReceiveLoop.Config(conn,
                     maxMessageSize,
                     false,
                     receiveQueue,

diff --git a/source/Runtime/Client/Webgl/SimpleWebJSLib.cs b/source/Runtime/Client/Webgl/SimpleWebJSLib.cs
@@ -5,7 +5,7 @@
 
 namespace JamesFrowen.SimpleWeb
 {
-    internal static class SimpleWebJSLib
+    static class SimpleWebJSLib
     {
 #if UNITY_WEBGL
         [DllImport("__Internal")]

diff --git a/source/Runtime/Common/MessageProcessor.cs b/source/Runtime/Common/MessageProcessor.cs
@@ -83,7 +83,7 @@ public static void ToggleMask(byte[] src, int srcOffset, byte[] dst, int dstOffs
         {
             for (int i = 0; i < messageLength; i++)
             {
-                byte maskByte = maskBuffer[maskOffset + i % Constants.MaskSize];
+                byte maskByte = maskBuffer[maskOffset + (i % Constants.MaskSize)];
                 dst[dstOffset + i] = (byte)(src[srcOffset + i] ^ maskByte);
             }
         }
@@ -104,14 +104,14 @@ static int GetMessageLength(byte[] buffer, int offset, byte lenByte)
             {
                 // header is 8 bytes 
                 ulong value = 0;
-                value |= ((ulong)buffer[offset + 2] << 56);
-                value |= ((ulong)buffer[offset + 3] << 48);
-                value |= ((ulong)buffer[offset + 4] << 40);
-                value |= ((ulong)buffer[offset + 5] << 32);
-                value |= ((ulong)buffer[offset + 6] << 24);
-                value |= ((ulong)buffer[offset + 7] << 16);
-                value |= ((ulong)buffer[offset + 8] << 8);
-                value |= ((ulong)buffer[offset + 9] << 0);
+                value |= (ulong)buffer[offset + 2] << 56;
+                value |= (ulong)buffer[offset + 3] << 48;
+                value |= (ulong)buffer[offset + 4] << 40;
+                value |= (ulong)buffer[offset + 5] << 32;
+                value |= (ulong)buffer[offset + 6] << 24;
+                value |= (ulong)buffer[offset + 7] << 16;
+                value |= (ulong)buffer[offset + 8] << 8;
+                value |= (ulong)buffer[offset + 9] << 0;
 
                 if (value > int.MaxValue)
                 {

diff --git a/source/Runtime/Common/ReceiveLoop.cs b/source/Runtime/Common/ReceiveLoop.cs
@@ -9,7 +9,7 @@
 
 namespace JamesFrowen.SimpleWeb
 {
-    internal static class ReceiveLoop
+    static class ReceiveLoop
     {
         public struct Config
         {
@@ -135,7 +135,7 @@ static void ReadOneMessage(Config config, byte[] buffer)
             else
             {
                 // todo cache this to avoid allocations
-                var fragments = new Queue<ArrayBuffer>();
+                Queue<ArrayBuffer> fragments = new Queue<ArrayBuffer>();
                 fragments.Enqueue(CopyMessageToBuffer(bufferPool, expectMask, buffer, msgOffset, header.payloadLength));
                 int totalSize = header.payloadLength;
 
@@ -175,7 +175,7 @@ static Header ReadHeader(Config config, byte[] buffer, bool opCodeContinuation =
         {
             (Connection conn, int maxMessageSize, bool expectMask, ConcurrentQueue<Message> queue, BufferPool bufferPool) = config;
             Stream stream = conn.stream;
-            var header = new Header();
+            Header header = new Header();
 
             // read 2
             header.offset = ReadHelper.Read(stream, buffer, header.offset, Constants.HeaderMinSize);
@@ -264,7 +264,7 @@ static string GetCloseMessage(byte[] buffer, int msgOffset, int payloadLength)
 
         static int GetCloseCode(byte[] buffer, int msgOffset)
         {
-            return buffer[msgOffset + 0] << 8 | buffer[msgOffset + 1];
+            return (buffer[msgOffset + 0] << 8) | buffer[msgOffset + 1];
         }
     }
 }