Skip to content

Commit 36373d7

Browse files
committed
Simplify code by using To_Lower as in pure HTTP/2 unit.
Part of S507-051.
1 parent 1295663 commit 36373d7

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/http2/aws-http2-message.adb

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
------------------------------------------------------------------------------
2929

3030
with Ada.Calendar;
31+
with Ada.Characters.Handling;
3132
with Ada.Strings.Unbounded;
3233
with Ada.Text_IO;
3334

@@ -45,11 +46,8 @@ package body AWS.HTTP2.Message is
4546

4647
use Ada.Strings.Unbounded;
4748

48-
function HN
49-
(Header_Name : String;
50-
Is_H2 : Boolean := True)
51-
return String renames Utils.Normalize_Lower;
52-
-- Fold header name to lower case as required by HTTP/2 protocol
49+
function To_Lower
50+
(Name : String) return String renames Ada.Characters.Handling.To_Lower;
5351

5452
-----------------
5553
-- Append_Body --
@@ -127,7 +125,7 @@ package body AWS.HTTP2.Message is
127125

128126
if Size /= Resources.Undefined_Length then
129127
O.Headers.Add
130-
(HN (Messages.Content_Length_Token), Utils.Image (Size));
128+
(To_Lower (Messages.Content_Length_Token), Utils.Image (Size));
131129
end if;
132130
end Set_Body;
133131

@@ -143,7 +141,7 @@ package body AWS.HTTP2.Message is
143141
-- Set status code
144142

145143
O.Headers.Add
146-
(HN (Messages.Status_Token),
144+
(To_Lower (Messages.Status_Token),
147145
Messages.Image (Response.Status_Code (Answer)));
148146

149147
if O.Mode /= Response.Header then
@@ -197,7 +195,7 @@ package body AWS.HTTP2.Message is
197195
(Answer, Messages.Last_Modified_Token)
198196
then
199197
O.Headers.Add
200-
(HN (Messages.Last_Modified_Token),
198+
(To_Lower (Messages.Last_Modified_Token),
201199
Messages.To_HTTP_Date (File_Time));
202200
end if;
203201

@@ -374,7 +372,8 @@ package body AWS.HTTP2.Message is
374372
begin
375373
if Size /= Resources.Undefined_Length then
376374
Self.Headers.Add
377-
(HN (Messages.Content_Length_Token), Utils.Image (Size));
375+
(To_Lower (Messages.Content_Length_Token),
376+
Utils.Image (Size));
378377
end if;
379378
end;
380379
end if;

0 commit comments

Comments
 (0)