From e02b5537394b8a55a2728997813e1d800aa099ed Mon Sep 17 00:00:00 2001 From: sta Date: Fri, 2 Oct 2015 11:32:36 +0900 Subject: [PATCH] [Modify] Rename it to ToArray --- websocket-sharp/Server/WebSocketServiceHost.cs | 4 +--- websocket-sharp/Server/WebSocketServiceManager.cs | 4 ++-- websocket-sharp/Server/WebSocketSessionManager.cs | 2 +- websocket-sharp/WebSocket.cs | 13 ++++++------- websocket-sharp/WebSocketFrame.cs | 10 +++++----- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/websocket-sharp/Server/WebSocketServiceHost.cs b/websocket-sharp/Server/WebSocketServiceHost.cs index 860019a5..c938a8ee 100644 --- a/websocket-sharp/Server/WebSocketServiceHost.cs +++ b/websocket-sharp/Server/WebSocketServiceHost.cs @@ -131,9 +131,7 @@ namespace WebSocketSharp.Server { var e = new CloseEventArgs (code, reason); var send = !code.IsReserved (); - var bytes = - send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToByteArray () : null; - + var bytes = send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToArray () : null; var timeout = send ? WaitTime : TimeSpan.Zero; Sessions.Stop (e, bytes, timeout); } diff --git a/websocket-sharp/Server/WebSocketServiceManager.cs b/websocket-sharp/Server/WebSocketServiceManager.cs index e28f4490..7c7e89d4 100644 --- a/websocket-sharp/Server/WebSocketServiceManager.cs +++ b/websocket-sharp/Server/WebSocketServiceManager.cs @@ -361,7 +361,7 @@ namespace WebSocketSharp.Server lock (_sync) { _state = ServerState.ShuttingDown; var bytes = send - ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToByteArray () + ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToArray () : null; var timeout = wait ? _waitTime : TimeSpan.Zero; @@ -582,7 +582,7 @@ namespace WebSocketSharp.Server return null; } - return broadping (WebSocketFrame.CreatePingFrame (data, false).ToByteArray (), _waitTime); + return broadping (WebSocketFrame.CreatePingFrame (data, false).ToArray (), _waitTime); } /// diff --git a/websocket-sharp/Server/WebSocketSessionManager.cs b/websocket-sharp/Server/WebSocketSessionManager.cs index 1c27e341..357e0135 100644 --- a/websocket-sharp/Server/WebSocketSessionManager.cs +++ b/websocket-sharp/Server/WebSocketSessionManager.cs @@ -587,7 +587,7 @@ namespace WebSocketSharp.Server return null; } - return Broadping (WebSocketFrame.CreatePingFrame (data, false).ToByteArray (), _waitTime); + return Broadping (WebSocketFrame.CreatePingFrame (data, false).ToArray (), _waitTime); } /// diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 6b3e9305..241bd4a2 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -749,7 +749,7 @@ namespace WebSocketSharp _logger.Trace ("Begin closing the connection."); e.WasClean = closeHandshake ( - send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, _client).ToByteArray () : null, + send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, _client).ToArray () : null, wait ? _waitTime : TimeSpan.Zero, _client ? (Action) releaseClientResources : releaseServerResources); @@ -1066,7 +1066,7 @@ namespace WebSocketSharp private bool processPingFrame (WebSocketFrame frame) { - if (send (new WebSocketFrame (Opcode.Pong, frame.PayloadData, _client).ToByteArray ())) + if (send (new WebSocketFrame (Opcode.Pong, frame.PayloadData, _client).ToArray ())) _logger.Trace ("Returned a Pong."); if (_emitOnPing) @@ -1259,8 +1259,7 @@ namespace WebSocketSharp return false; } - return sendBytes ( - new WebSocketFrame (fin, opcode, data, compressed, _client).ToByteArray ()); + return sendBytes (new WebSocketFrame (fin, opcode, data, compressed, _client).ToArray ()); } } @@ -1756,7 +1755,7 @@ namespace WebSocketSharp data.Compress (_compression), _compression != CompressionMethod.None, false) - .ToByteArray (); + .ToArray (); cache.Add (_compression, cached); } @@ -2226,7 +2225,7 @@ namespace WebSocketSharp public bool Ping () { var bytes = _client - ? WebSocketFrame.CreatePingFrame (true).ToByteArray () + ? WebSocketFrame.CreatePingFrame (true).ToArray () : WebSocketFrame.EmptyUnmaskPingBytes; return Ping (bytes, _waitTime); @@ -2256,7 +2255,7 @@ namespace WebSocketSharp return false; } - return Ping (WebSocketFrame.CreatePingFrame (data, _client).ToByteArray (), _waitTime); + return Ping (WebSocketFrame.CreatePingFrame (data, _client).ToArray (), _waitTime); } /// diff --git a/websocket-sharp/WebSocketFrame.cs b/websocket-sharp/WebSocketFrame.cs index 2ef5e758..2fc58798 100644 --- a/websocket-sharp/WebSocketFrame.cs +++ b/websocket-sharp/WebSocketFrame.cs @@ -68,7 +68,7 @@ namespace WebSocketSharp static WebSocketFrame () { - EmptyUnmaskPingBytes = CreatePingFrame (false).ToByteArray (); + EmptyUnmaskPingBytes = CreatePingFrame (false).ToArray (); } #endregion @@ -347,7 +347,7 @@ namespace WebSocketSharp output.AppendFormat (headerFmt, String.Empty); - var bytes = frame.ToByteArray (); + var bytes = frame.ToArray (); for (long i = 0; i <= cnt; i++) { var j = i * 4; if (i < cnt) { @@ -742,7 +742,7 @@ Extended Payload Length: {7} public IEnumerator GetEnumerator () { - foreach (var b in ToByteArray ()) + foreach (var b in ToArray ()) yield return b; } @@ -756,7 +756,7 @@ Extended Payload Length: {7} return dumped ? dump (this) : print (this); } - public byte[] ToByteArray () + public byte[] ToArray () { using (var buff = new MemoryStream ()) { var header = (int) _fin; @@ -789,7 +789,7 @@ Extended Payload Length: {7} public override string ToString () { - return BitConverter.ToString (ToByteArray ()); + return BitConverter.ToString (ToArray ()); } #endregion