Minor reformat, refactoring, and fix comment

Author: anisimkov

src/core/aws-net-websocket-protocol-rfc6455.adb

@@ -124,21 +124,24 @@ package body AWS.Net.WebSocket.Protocol.RFC6455 is
    -------------------------
 
    overriding procedure Add_Connect_Headers
-      (Protocol : State;
-       Host     : String;
-       Headers  : in out AWS.Headers.List)
+     (Protocol : State;
+      Host     : String;
+      Headers  : in out AWS.Headers.List)
    is
+      use AWS.Messages;
+
       pragma Unreferenced (Protocol);
+
       Ints : array (1 .. 4) of AWS.Utils.Random_Integer :=
                (others => Utils.Random);
       H : Stream_Element_Array (1 .. 16) with Import, Address => Ints'Address;
 
    begin
-      Headers.Add ("Host", Host);
-      Headers.Add ("Upgrade", "WebSocket");
-      Headers.Add ("Connection", "Upgrade");
-      Headers.Add ("Sec-WebSocket-Key", Translator.Base64_Encode (H));
-      Headers.Add ("Sec-WebSocket-Version", "13");
+      Headers.Add (Host_Token, Host);
+      Headers.Add (Upgrade_Token, "WebSocket");
+      Headers.Add (Connection_Token, "Upgrade");
+      Headers.Add (Sec_WebSocket_Key_Token, Translator.Base64_Encode (H));
+      Headers.Add (Sec_WebSocket_Version_Token, "13");
    end Add_Connect_Headers;
 
    ----------------------------
@@ -152,12 +155,14 @@ package body AWS.Net.WebSocket.Protocol.RFC6455 is
       return Boolean
    is
       pragma Unreferenced (Protocol);
+
       Expected : constant String :=
                    Get_Websocket_Accept
-                      (AWS.Headers.Get
-                         (Request, AWS.Messages.Sec_WebSocket_Key_Token));
-      Actual : constant String := AWS.Response.Header
-                (Response, AWS.Messages.Sec_WebSocket_Accept_Token);
+                     (AWS.Headers.Get
+                        (Request, Messages.Sec_WebSocket_Key_Token));
+      Actual : constant String :=
+                 AWS.Response.Header
+                   (Response, Messages.Sec_WebSocket_Accept_Token);
    begin
       return Expected = Actual;
    end Check_Connect_Response;
@@ -622,13 +627,12 @@ package body AWS.Net.WebSocket.Protocol.RFC6455 is
          Mask := Create_Random_Mask;
       end if;
 
-      if Socket.State.Kind = Text then
-         Send_Frame_Header (Protocol, Socket, O_Text, Data'Length,
-                            Has_Mask => From_Client, Mask => Mask);
-      else
-         Send_Frame_Header (Protocol, Socket, O_Binary, Data'Length,
-                            Has_Mask => From_Client, Mask => Mask);
-      end if;
+      Send_Frame_Header
+        (Protocol, Socket,
+         (if Socket.State.Kind = Text then O_Text else O_Binary),
+         Data'Length,
+         Has_Mask => From_Client,
+         Mask     => Mask);
 
       --  Send payload
 

src/core/aws-net-websocket-registry.adb

@@ -345,8 +345,6 @@ package body AWS.Net.WebSocket.Registry is
             WebSocket : Object_Class;
             Message   : Unbounded_String;
          begin
-            Message := Null_Unbounded_String;
-
             Message_Queue.Get (WebSocket);
 
             --  A WebSocket is null when termination is requested

src/core/aws-net-websocket.adb

@@ -432,15 +432,18 @@ package body AWS.Net.WebSocket is
       Obj   : Object_Class := Socket'Unrestricted_Access;
       Event : AWS.Net.Event_Set;
       Msg   : Ada.Strings.Unbounded.Unbounded_String;
+
    begin
       Event := Socket.Poll
          ((AWS.Net.Input => True, others => False), Timeout => Timeout);
 
       if Event (AWS.Net.Input) then
          --  Block until we have received all chunks of the frame
-         while not Read_Message (Obj, Msg) loop
-            null;
+
+         loop
+            exit when Read_Message (Obj, Msg);
          end loop;
+
          return True;
 
       elsif Event (AWS.Net.Error) then

src/core/aws-net-websocket.ads

@@ -412,7 +412,7 @@ private
    --  Process the current message on the socket.
    --  Return True if a complete message was read.
    --  Data is accumulated in Message, until the message is complete. At this
-   --  stage, Socket.On_Message will be called.
+   --  stage, Socket.On_Success will be called.
    --  In case of error, other callbacks will be used as appropriate.
 
    overriding function Is_Secure (Socket : Object) return Boolean