Clean-up multiple definitions of CRLF.

TurboGit · TurboGit · commit 329654af0803 · 2021-10-05T18:36:42.000+02:00
Part of S507-051.
diff --git a/src/core/aws-attachments.adb b/src/core/aws-attachments.adb
@@ -339,8 +339,6 @@ package body AWS.Attachments is
      (Attachments : List;
       Boundary    : String)
    is
-      CRLF : constant String := String'(1 => ASCII.CR, 2 => ASCII.LF);
-
       procedure Send_Attachment (Attachment : Element);
       --  Sends one Attachment, including the start boundary
 
@@ -635,7 +633,6 @@ package body AWS.Attachments is
       Boundary    : out Unbounded_String;
       Alternative : Boolean := False)
    is
-      CRLF       : constant String := String'(1 => ASCII.CR, 2 => ASCII.LF);
       L_Boundary : constant String :=
                      "----=_NextPart_" & Utils.Random_String (10) & "."
                      & Utils.Image (UID.Value);
diff --git a/src/core/aws-client-http_utils.adb b/src/core/aws-client-http_utils.adb
@@ -934,7 +934,6 @@ package body AWS.Client.HTTP_Utils is
    is
       use Real_Time;
 
-      CRLF      : constant String := String'(1 => ASCII.CR, 2 => ASCII.LF);
       Stamp     : constant Time := Clock;
       Settings  : constant HTTP2.Frame.Settings.Set :=
                     Get_Settings (Connection.Config);
diff --git a/src/core/aws-headers.adb b/src/core/aws-headers.adb
@@ -79,9 +79,7 @@ package body AWS.Headers is
 
    procedure Get_Content
      (Headers   : List;
-      End_Block : Boolean := False)
-   is
-      CRLF : constant String := String'(1 => ASCII.CR, 2 => ASCII.LF);
+      End_Block : Boolean := False) is
    begin
       for J in 1 .. Count (Headers) loop
          Data (Get_Line (Headers, J) & CRLF);
diff --git a/src/core/aws-net-buffered.adb b/src/core/aws-net-buffered.adb
@@ -36,7 +36,8 @@ with AWS.Translator;
 package body AWS.Net.Buffered is
 
    CRLF : constant Stream_Element_Array :=
-            Translator.To_Stream_Element_Array (ASCII.CR & ASCII.LF);
+            (1 => Character'Pos (ASCII.CR),
+             2 => Character'Pos (ASCII.LF));
 
    Input_Limit : Positive := AWS.Default.Input_Line_Size_Limit with Atomic;
 
diff --git a/src/core/aws-response.ads b/src/core/aws-response.ads
@@ -435,8 +435,6 @@ private
    Default_Moved_Message : constant String :=
                              "Page moved<br><a href=""_@_"">Click here</a>";
 
-   CRLF : constant String := ASCII.CR & ASCII.LF;
-
    Default_Authenticate_Message : constant String :=
      "<HTML><HEAD>" & CRLF
      & "<TITLE>401 Authorization Required</TITLE>" & CRLF
diff --git a/src/core/aws.ads b/src/core/aws.ads
@@ -41,4 +41,6 @@ package AWS with Pure is
 
    type HTTP_Protocol is (HTTPv1, HTTPv2);
 
+   CRLF : constant String := String'(1 => ASCII.CR, 2 => ASCII.LF);
+
 end AWS;
diff --git a/src/extended/aws-pop.adb b/src/extended/aws-pop.adb
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2003-2019, AdaCore                     --
+--                     Copyright (C) 2003-2021, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -48,8 +48,6 @@ package body AWS.POP is
 
    subtype Stream_Type is AWS.Resources.Streams.Memory.Stream_Type;
 
-   CRLF : constant String := ASCII.CR & ASCII.LF;
-
    procedure Check_Response (Response : String);
    --  Checks server's response, raise POP_Error with server's message
 
diff --git a/src/extended/aws-smtp-server.adb b/src/extended/aws-smtp-server.adb
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2008-2017, AdaCore                     --
+--                     Copyright (C) 2008-2021, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -98,7 +98,6 @@ package body AWS.SMTP.Server is
    is
 
       Empty_Line : constant String := "";
-      CRLF       : constant String := ASCII.CR & ASCII.LF;
 
       procedure Read_Message_Body;
       --  Read message body from the current socket and set the Message_Body
