From 2937598db9dc38201d0b9106fd5a5a6bf3efa608 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Wed, 16 Sep 2015 11:10:10 +0900
Subject: [PATCH] [Modify] Polish it

---
 websocket-sharp/Ext.cs | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs
index 60c82c67..8fcd72ce 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -140,26 +140,6 @@ namespace WebSocketSharp
       }
     }
 
-    private static byte[] readBytes (this Stream stream, byte[] buffer, int offset, int count)
-    {
-      var nread = 0;
-      try {
-        while (true) {
-          nread = stream.Read (buffer, offset, count);
-          if (nread == 0 || nread == count)
-            break;
-
-          offset += nread;
-          count -= nread;
-        }
-      }
-      catch {
-        nread = 0;
-      }
-
-      return buffer.SubArray (0, offset + nread);
-    }
-
     private static void readBytesAsync (
       this Stream stream,
       byte[] buffer,
@@ -591,7 +571,23 @@ namespace WebSocketSharp
 
     internal static byte[] ReadBytes (this Stream stream, int length)
     {
-      return stream.readBytes (new byte[length], 0, length);
+      var buff = new byte[length];
+      var offset = 0;
+      try {
+        var nread = 0;
+        while (length > 0) {
+          nread = stream.Read (buff, offset, length);
+          if (nread == 0)
+            break;
+
+          offset += nread;
+          length -= nread;
+        }
+      }
+      catch {
+      }
+
+      return buff.SubArray (0, offset);
     }
 
     internal static byte[] ReadBytes (this Stream stream, long length, int bufferLength)