Minor code reformatting and clean-up.

Part of S507-051.

Author: TurboGit

src/core/aws-client-http_utils.adb

@@ -32,6 +32,7 @@ pragma Ada_2012;
 with Ada.Characters.Handling;
 with Ada.Exceptions;
 with Ada.Strings.Fixed;
+with Ada.Strings.Maps;
 
 with AWS.Digest;
 with AWS.Headers.Values;
@@ -772,10 +773,10 @@ package body AWS.Client.HTTP_Utils is
       Headers      : Header_List          := Empty_Header_List)
    is
       use Real_Time;
-      Stamp     : constant Time := Clock;
-      Pref_Suf  : constant String := "--";
-      Boundary  : constant String :=
-                    "AWS_Attachment-" & Utils.Random_String (8);
+      Stamp    : constant Time := Clock;
+      Pref_Suf : constant String := "--";
+      Boundary : constant String :=
+                   "AWS_Attachment-" & Utils.Random_String (8);
 
       Root_Content_Id  : constant String := "<rootpart>";
       Root_Part_Header : AWS.Headers.List;
@@ -1081,10 +1082,7 @@ package body AWS.Client.HTTP_Utils is
             Decrement_Authentication_Attempt
               (Connection, Auth_Attempts, Auth_Is_Over);
 
-            if Auth_Is_Over then
-               exit Retry;
-            end if;
-
+            exit Retry when Auth_Is_Over;
          exception
             when E : Net.Socket_Error | Connection_Error =>
                Error_Processing
@@ -1246,23 +1244,9 @@ package body AWS.Client.HTTP_Utils is
       --  Returns "Keep-Alive" is we have a persistent connection and "Close"
       --  otherwise.
 
-      function Encoded_URI return String;
-      --  Returns URI encoded (' ' -> '+')
-
-      -----------------
-      -- Encoded_URI --
-      -----------------
-
       function Encoded_URI return String is
-         E_URI : String := URI;
-      begin
-         for K in E_URI'Range loop
-            if E_URI (K) = ' ' then
-               E_URI (K) := '+';
-            end if;
-         end loop;
-         return E_URI;
-      end Encoded_URI;
+        (Strings.Fixed.Translate (URI, Strings.Maps.To_Mapping (" ", "+")));
+      --  Returns URI encoded (' ' -> '+')
 
       -----------------
       -- Persistence --
@@ -1501,6 +1485,7 @@ package body AWS.Client.HTTP_Utils is
                Response.Set.Append_Body
                  (Result, "..." & ASCII.LF & " Response Timeout");
             end if;
+
             Response.Set.Status_Code (Result, Messages.S408);
             exit;
          end if;
@@ -1886,8 +1871,7 @@ package body AWS.Client.HTTP_Utils is
 
       --  Send the setting frame (stream id 0)
 
-      HTTP2.Frame.Settings.Create
-        (Settings).Send (Connection.Socket.all);
+      HTTP2.Frame.Settings.Create (Settings).Send (Connection.Socket.all);
 
       --  We need to read the settings from server
 

src/core/aws-parameters.adb

@@ -154,7 +154,9 @@ package body AWS.Parameters is
    ---------
 
    procedure Add
-     (Parameter_List : in out List; Name, Value : String; Decode : Boolean) is
+     (Parameter_List : in out List;
+      Name, Value    : String;
+      Decode         : Boolean) is
    begin
       if Decode then
          Parameter_List.Add (URL.Decode (Name), URL.Decode (Value));
@@ -283,9 +285,9 @@ package body AWS.Parameters is
    function URI_Format
      (Parameter_List : List; Limit : Positive := Positive'Last) return String
    is
-      Delimiter : Character := '?';
+      Delimiter  : Character := '?';
       Parameters : Unbounded_String;
-      Size : Positive := 1;
+      Size       : Positive := 1;
    begin
       for J in 1 .. Parameter_List.Count loop
          declare

src/core/aws-resources-streams.adb

@@ -96,10 +96,10 @@ package body AWS.Resources.Streams is
    is
       use type Embedded.Buffer_Access;
 
-      Stream  : Stream_Access;
       In_GZip : constant Boolean := GZip;
       Buffer  : constant Embedded.Buffer_Access :=
                   Embedded.Get_Buffer (Name, GZip);
+      Stream  : Stream_Access;
    begin
       if Buffer /= null then
          Stream := new Memory.Stream_Type;