NetworkPkg: Use the New Functions from HttpLib

[mirror_edk2.git] / NetworkPkg / HttpUtilitiesDxe / HttpUtilitiesProtocol.c

diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
index a83c9633fc0297def5865faa498fead555b17c9e..739d3b753cddd5ca469ed461ca619d8183e0c03e 100644 (file)
--- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
+++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
@@ -2,6 +2,7 @@
   Implementation of EFI_HTTP_PROTOCOL protocol interfaces.\r
 \r
   Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
   Implementation of EFI_HTTP_PROTOCOL protocol interfaces.\r
 \r
   Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r

+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -122,8 +123,8 @@ HttpUtilitiesBuild (
       //\r
       // Check whether each SeedHeaderFields member is in DeleteList\r
       //\r
       //\r
       // Check whether each SeedHeaderFields member is in DeleteList\r
       //\r

-      if (IsValidHttpHeader( DeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {\r
-        Status = SetFieldNameAndValue (\r
+      if (HttpIsValidHttpHeader( DeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {\r
+        Status = HttpSetFieldNameAndValue (\r

                    &TempHeaderFields[TempFieldCount], \r
                    SeedHeaderFields[Index].FieldName, \r
                    SeedHeaderFields[Index].FieldValue\r
                    &TempHeaderFields[TempFieldCount], \r
                    SeedHeaderFields[Index].FieldName, \r
                    SeedHeaderFields[Index].FieldValue\r


@@ -149,7 +150,7 @@ HttpUtilitiesBuild (
   }\r
 \r
   for (Index = 0; Index < TempFieldCount; Index++) {\r
   }\r
 \r
   for (Index = 0; Index < TempFieldCount; Index++) {\r

-    Status = SetFieldNameAndValue (\r
+    Status = HttpSetFieldNameAndValue (\r

                &NewHeaderFields[Index], \r
                TempHeaderFields[Index].FieldName, \r
                TempHeaderFields[Index].FieldValue\r
                &NewHeaderFields[Index], \r
                TempHeaderFields[Index].FieldName, \r
                TempHeaderFields[Index].FieldValue\r


@@ -162,9 +163,9 @@ HttpUtilitiesBuild (
   NewFieldCount = TempFieldCount;\r
 \r
   for (Index = 0; Index < AppendCount; Index++) {\r
   NewFieldCount = TempFieldCount;\r
 \r
   for (Index = 0; Index < AppendCount; Index++) {\r

-    HttpHeader = FindHttpHeader (NewHeaderFields, NewFieldCount, AppendList[Index]->FieldName);\r
+    HttpHeader = HttpFindHeader (NewFieldCount, NewHeaderFields, AppendList[Index]->FieldName);\r

     if (HttpHeader != NULL) {\r
     if (HttpHeader != NULL) {\r

-      Status = SetFieldNameAndValue (\r
+      Status = HttpSetFieldNameAndValue (\r

                  HttpHeader, \r
                  AppendList[Index]->FieldName, \r
                  AppendList[Index]->FieldValue\r
                  HttpHeader, \r
                  AppendList[Index]->FieldName, \r
                  AppendList[Index]->FieldValue\r


@@ -173,7 +174,7 @@ HttpUtilitiesBuild (
         goto ON_EXIT;\r
       }\r
     } else {\r
         goto ON_EXIT;\r
       }\r
     } else {\r

-      Status = SetFieldNameAndValue (\r
+      Status = HttpSetFieldNameAndValue (\r

                  &NewHeaderFields[NewFieldCount], \r
                  AppendList[Index]->FieldName, \r
                  AppendList[Index]->FieldValue\r
                  &NewHeaderFields[NewFieldCount], \r
                  AppendList[Index]->FieldName, \r
                  AppendList[Index]->FieldValue\r


@@ -251,15 +252,15 @@ HttpUtilitiesBuild (
   //\r
 ON_EXIT:\r
   if (SeedHeaderFields != NULL) {\r
   //\r
 ON_EXIT:\r
   if (SeedHeaderFields != NULL) {\r

-    FreeHeaderFields(SeedHeaderFields, SeedFieldCount);\r
+    HttpFreeHeaderFields(SeedHeaderFields, SeedFieldCount);\r

   }\r
   \r
   if (TempHeaderFields != NULL) {\r
   }\r
   \r
   if (TempHeaderFields != NULL) {\r

-    FreeHeaderFields(TempHeaderFields, TempFieldCount);\r
+    HttpFreeHeaderFields(TempHeaderFields, TempFieldCount);\r

   }\r
 \r
   if (NewHeaderFields != NULL) {\r
   }\r
 \r
   if (NewHeaderFields != NULL) {\r

-    FreeHeaderFields(NewHeaderFields, NewFieldCount);\r
+    HttpFreeHeaderFields(NewHeaderFields, NewFieldCount);\r

   }\r
   \r
   return Status;\r
   }\r
   \r
   return Status;\r


@@ -332,7 +333,7 @@ HttpUtilitiesParse (
   while (TRUE) {\r
     FieldName     = NULL;\r
     FieldValue    = NULL;\r
   while (TRUE) {\r
     FieldName     = NULL;\r
     FieldValue    = NULL;\r

-    NextToken = GetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
+    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r

     Token     = NextToken;\r
     if (FieldName == NULL || FieldValue == NULL) {\r
       break;\r
     Token     = NextToken;\r
     if (FieldName == NULL || FieldValue == NULL) {\r
       break;\r


@@ -365,16 +366,16 @@ HttpUtilitiesParse (
   while (Index < *FieldCount) {\r
     FieldName     = NULL;\r
     FieldValue    = NULL;\r
   while (Index < *FieldCount) {\r
     FieldName     = NULL;\r
     FieldValue    = NULL;\r

-    NextToken = GetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
+    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r

     Token     = NextToken;\r
     if (FieldName == NULL || FieldValue == NULL) {\r
       break;\r
     }\r
 \r
     Token     = NextToken;\r
     if (FieldName == NULL || FieldValue == NULL) {\r
       break;\r
     }\r
 \r

-    Status = SetFieldNameAndValue (&(*HeaderFields)[Index], FieldName, FieldValue);\r
+    Status = HttpSetFieldNameAndValue (&(*HeaderFields)[Index], FieldName, FieldValue);\r

     if (EFI_ERROR (Status)) {\r
       *FieldCount = 0;\r
     if (EFI_ERROR (Status)) {\r
       *FieldCount = 0;\r

-      FreeHeaderFields (*HeaderFields, Index);\r
+      HttpFreeHeaderFields (*HeaderFields, Index);\r

       goto ON_EXIT;\r
     }\r
     \r
       goto ON_EXIT;\r
     }\r
     \r