]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/HttpBootDxe/HttpBootClient.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / HttpBootDxe / HttpBootClient.c
index d12076b2202c57c9926fc62380756333ba1be690..62e87238fef7bc9d577c7099ebf92355c13a503c 100644 (file)
@@ -21,15 +21,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 HttpBootUpdateDevicePath (\r
-  IN   HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN   HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_DEV_PATH               *Node;\r
-  EFI_DEVICE_PATH_PROTOCOL   *TmpIpDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL   *TmpDnsDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL   *NewDevicePath;\r
-  UINTN                      Length;\r
-  EFI_STATUS                 Status;\r
+  EFI_DEV_PATH              *Node;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TmpIpDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TmpDnsDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
+  UINTN                     Length;\r
+  EFI_STATUS                Status;\r
 \r
   TmpIpDevicePath  = NULL;\r
   TmpDnsDevicePath = NULL;\r
@@ -42,6 +42,7 @@ HttpBootUpdateDevicePath (
     if (Node == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     Node->Ipv4.Header.Type    = MESSAGING_DEVICE_PATH;\r
     Node->Ipv4.Header.SubType = MSG_IPv4_DP;\r
     SetDevicePathNodeLength (Node, sizeof (IPv4_DEVICE_PATH));\r
@@ -56,8 +57,9 @@ HttpBootUpdateDevicePath (
     if (Node == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Node->Ipv6.Header.Type     = MESSAGING_DEVICE_PATH;\r
-    Node->Ipv6.Header.SubType  = MSG_IPv6_DP;\r
+\r
+    Node->Ipv6.Header.Type    = MESSAGING_DEVICE_PATH;\r
+    Node->Ipv6.Header.SubType = MSG_IPv6_DP;\r
     SetDevicePathNodeLength (Node, sizeof (IPv6_DEVICE_PATH));\r
     Node->Ipv6.PrefixLength    = IP6_PREFIX_LENGTH;\r
     Node->Ipv6.RemotePort      = Private->Port;\r
@@ -68,7 +70,7 @@ HttpBootUpdateDevicePath (
     CopyMem (&Node->Ipv6.GatewayIpAddress, &Private->GatewayIp.v6, sizeof (EFI_IPv6_ADDRESS));\r
   }\r
 \r
-  TmpIpDevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+  TmpIpDevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
   FreePool (Node);\r
   if (TmpIpDevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -79,18 +81,19 @@ HttpBootUpdateDevicePath (
   //\r
   if (Private->DnsServerIp != NULL) {\r
     Length = sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (Node->Dns.IsIPv6) + Private->DnsServerCount * sizeof (EFI_IP_ADDRESS);\r
-    Node = AllocatePool (Length);\r
+    Node   = AllocatePool (Length);\r
     if (Node == NULL) {\r
       FreePool (TmpIpDevicePath);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     Node->DevPath.Type    = MESSAGING_DEVICE_PATH;\r
     Node->DevPath.SubType = MSG_DNS_DP;\r
     SetDevicePathNodeLength (Node, Length);\r
     Node->Dns.IsIPv6 = Private->UsingIpv6 ? 0x01 : 0x00;\r
-    CopyMem ((UINT8*) Node + sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (Node->Dns.IsIPv6), Private->DnsServerIp, Private->DnsServerCount * sizeof (EFI_IP_ADDRESS));\r
+    CopyMem ((UINT8 *)Node + sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (Node->Dns.IsIPv6), Private->DnsServerIp, Private->DnsServerCount * sizeof (EFI_IP_ADDRESS));\r
 \r
-    TmpDnsDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+    TmpDnsDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
     FreePool (Node);\r
     FreePool (TmpIpDevicePath);\r
     TmpIpDevicePath = NULL;\r
@@ -103,29 +106,33 @@ HttpBootUpdateDevicePath (
   // Update the URI node with the boot file URI.\r
   //\r
   Length = sizeof (EFI_DEVICE_PATH_PROTOCOL) + AsciiStrSize (Private->BootFileUri);\r
-  Node = AllocatePool (Length);\r
+  Node   = AllocatePool (Length);\r
   if (Node == NULL) {\r
     if (TmpIpDevicePath != NULL) {\r
       FreePool (TmpIpDevicePath);\r
     }\r
+\r
     if (TmpDnsDevicePath != NULL) {\r
       FreePool (TmpDnsDevicePath);\r
     }\r
+\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   Node->DevPath.Type    = MESSAGING_DEVICE_PATH;\r
   Node->DevPath.SubType = MSG_URI_DP;\r
   SetDevicePathNodeLength (Node, Length);\r
-  CopyMem ((UINT8*) Node + sizeof (EFI_DEVICE_PATH_PROTOCOL), Private->BootFileUri, AsciiStrSize (Private->BootFileUri));\r
+  CopyMem ((UINT8 *)Node + sizeof (EFI_DEVICE_PATH_PROTOCOL), Private->BootFileUri, AsciiStrSize (Private->BootFileUri));\r
 \r
   if (TmpDnsDevicePath != NULL) {\r
-    NewDevicePath = AppendDevicePathNode (TmpDnsDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+    NewDevicePath = AppendDevicePathNode (TmpDnsDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
     FreePool (TmpDnsDevicePath);\r
   } else {\r
     ASSERT (TmpIpDevicePath != NULL);\r
-    NewDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+    NewDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
     FreePool (TmpIpDevicePath);\r
   }\r
+\r
   FreePool (Node);\r
   if (NewDevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -160,6 +167,7 @@ HttpBootUpdateDevicePath (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     FreePool (Private->Ip6Nic->DevicePath);\r
     Private->Ip6Nic->DevicePath = NewDevicePath;\r
   }\r
@@ -178,16 +186,16 @@ HttpBootUpdateDevicePath (
 **/\r
 EFI_STATUS\r
 HttpBootDhcp4ExtractUriInfo (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  HTTP_BOOT_DHCP4_PACKET_CACHE    *SelectOffer;\r
-  HTTP_BOOT_DHCP4_PACKET_CACHE    *HttpOffer;\r
-  UINT32                          SelectIndex;\r
-  UINT32                          ProxyIndex;\r
-  UINT32                          DnsServerIndex;\r
-  EFI_DHCP4_PACKET_OPTION         *Option;\r
-  EFI_STATUS                      Status;\r
+  HTTP_BOOT_DHCP4_PACKET_CACHE  *SelectOffer;\r
+  HTTP_BOOT_DHCP4_PACKET_CACHE  *HttpOffer;\r
+  UINT32                        SelectIndex;\r
+  UINT32                        ProxyIndex;\r
+  UINT32                        DnsServerIndex;\r
+  EFI_DHCP4_PACKET_OPTION       *Option;\r
+  EFI_STATUS                    Status;\r
 \r
   ASSERT (Private != NULL);\r
   ASSERT (Private->SelectIndex != 0);\r
@@ -209,21 +217,23 @@ HttpBootDhcp4ExtractUriInfo (
     //\r
     if ((SelectOffer->OfferType == HttpOfferTypeDhcpIpUri) ||\r
         (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns) ||\r
-        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns)) {\r
+        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns))\r
+    {\r
       HttpOffer = SelectOffer;\r
     } else {\r
       ASSERT (Private->SelectProxyType != HttpOfferTypeMax);\r
       ProxyIndex = Private->OfferIndex[Private->SelectProxyType][0];\r
-      HttpOffer = &Private->OfferBuffer[ProxyIndex].Dhcp4;\r
+      HttpOffer  = &Private->OfferBuffer[ProxyIndex].Dhcp4;\r
     }\r
+\r
     Private->BootFileUriParser = HttpOffer->UriParser;\r
-    Private->BootFileUri = (CHAR8*) HttpOffer->OptList[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data;\r
+    Private->BootFileUri       = (CHAR8 *)HttpOffer->OptList[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data;\r
   } else {\r
     //\r
     // In Home environment the BootFileUri comes from the FilePath.\r
     //\r
     Private->BootFileUriParser = Private->FilePathUriParser;\r
-    Private->BootFileUri = Private->FilePathUri;\r
+    Private->BootFileUri       = Private->FilePathUri;\r
   }\r
 \r
   //\r
@@ -237,12 +247,14 @@ HttpBootDhcp4ExtractUriInfo (
     } else if (Status == EFI_ACCESS_DENIED) {\r
       AsciiPrint ("\n  Error: Access forbidden, only HTTPS connection is allowed.\n");\r
     }\r
+\r
     return Status;\r
   }\r
 \r
   if ((SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns) ||\r
       (SelectOffer->OfferType == HttpOfferTypeDhcpDns) ||\r
-      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns)) {\r
+      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns))\r
+  {\r
     Option = SelectOffer->OptList[HTTP_BOOT_DHCP4_TAG_INDEX_DNS_SERVER];\r
     ASSERT (Option != NULL);\r
 \r
@@ -257,7 +269,7 @@ HttpBootDhcp4ExtractUriInfo (
     }\r
 \r
     for (DnsServerIndex = 0; DnsServerIndex < Private->DnsServerCount; DnsServerIndex++) {\r
-      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v4), &(((EFI_IPv4_ADDRESS *) Option->Data)[DnsServerIndex]), sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v4), &(((EFI_IPv4_ADDRESS *)Option->Data)[DnsServerIndex]), sizeof (EFI_IPv4_ADDRESS));\r
     }\r
 \r
     //\r
@@ -283,7 +295,7 @@ HttpBootDhcp4ExtractUriInfo (
              Private->BootFileUriParser,\r
              &Private->Port\r
              );\r
-  if (EFI_ERROR (Status) || Private->Port == 0) {\r
+  if (EFI_ERROR (Status) || (Private->Port == 0)) {\r
     Private->Port = 80;\r
   }\r
 \r
@@ -295,7 +307,7 @@ HttpBootDhcp4ExtractUriInfo (
   // Update the device path to include the boot resource information.\r
   //\r
   Status = HttpBootUpdateDevicePath (Private);\r
-  if (EFI_ERROR (Status) && Private->DnsServerIp != NULL) {\r
+  if (EFI_ERROR (Status) && (Private->DnsServerIp != NULL)) {\r
     FreePool (Private->DnsServerIp);\r
     Private->DnsServerIp = NULL;\r
   }\r
@@ -314,20 +326,20 @@ HttpBootDhcp4ExtractUriInfo (
 **/\r
 EFI_STATUS\r
 HttpBootDhcp6ExtractUriInfo (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  HTTP_BOOT_DHCP6_PACKET_CACHE    *SelectOffer;\r
-  HTTP_BOOT_DHCP6_PACKET_CACHE    *HttpOffer;\r
-  UINT32                          SelectIndex;\r
-  UINT32                          ProxyIndex;\r
-  UINT32                          DnsServerIndex;\r
-  EFI_DHCP6_PACKET_OPTION         *Option;\r
-  EFI_IPv6_ADDRESS                IpAddr;\r
-  CHAR8                           *HostName;\r
-  UINTN                           HostNameSize;\r
-  CHAR16                          *HostNameStr;\r
-  EFI_STATUS                      Status;\r
+  HTTP_BOOT_DHCP6_PACKET_CACHE  *SelectOffer;\r
+  HTTP_BOOT_DHCP6_PACKET_CACHE  *HttpOffer;\r
+  UINT32                        SelectIndex;\r
+  UINT32                        ProxyIndex;\r
+  UINT32                        DnsServerIndex;\r
+  EFI_DHCP6_PACKET_OPTION       *Option;\r
+  EFI_IPv6_ADDRESS              IpAddr;\r
+  CHAR8                         *HostName;\r
+  UINTN                         HostNameSize;\r
+  CHAR16                        *HostNameStr;\r
+  EFI_STATUS                    Status;\r
 \r
   ASSERT (Private != NULL);\r
   ASSERT (Private->SelectIndex != 0);\r
@@ -349,21 +361,23 @@ HttpBootDhcp6ExtractUriInfo (
     //\r
     if ((SelectOffer->OfferType == HttpOfferTypeDhcpIpUri) ||\r
         (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns) ||\r
-        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns)) {\r
+        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns))\r
+    {\r
       HttpOffer = SelectOffer;\r
     } else {\r
       ASSERT (Private->SelectProxyType != HttpOfferTypeMax);\r
       ProxyIndex = Private->OfferIndex[Private->SelectProxyType][0];\r
-      HttpOffer = &Private->OfferBuffer[ProxyIndex].Dhcp6;\r
+      HttpOffer  = &Private->OfferBuffer[ProxyIndex].Dhcp6;\r
     }\r
+\r
     Private->BootFileUriParser = HttpOffer->UriParser;\r
-    Private->BootFileUri = (CHAR8*) HttpOffer->OptList[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data;\r
+    Private->BootFileUri       = (CHAR8 *)HttpOffer->OptList[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data;\r
   } else {\r
     //\r
     // In Home environment the BootFileUri comes from the FilePath.\r
     //\r
     Private->BootFileUriParser = Private->FilePathUriParser;\r
-    Private->BootFileUri = Private->FilePathUri;\r
+    Private->BootFileUri       = Private->FilePathUri;\r
   }\r
 \r
   //\r
@@ -377,6 +391,7 @@ HttpBootDhcp6ExtractUriInfo (
     } else if (Status == EFI_ACCESS_DENIED) {\r
       AsciiPrint ("\n  Error: Access forbidden, only HTTPS connection is allowed.\n");\r
     }\r
+\r
     return Status;\r
   }\r
 \r
@@ -398,7 +413,8 @@ HttpBootDhcp6ExtractUriInfo (
 \r
   if ((SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns) ||\r
       (SelectOffer->OfferType == HttpOfferTypeDhcpDns) ||\r
-      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns)) {\r
+      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns))\r
+  {\r
     Option = SelectOffer->OptList[HTTP_BOOT_DHCP6_IDX_DNS_SERVER];\r
     ASSERT (Option != NULL);\r
 \r
@@ -413,7 +429,7 @@ HttpBootDhcp6ExtractUriInfo (
     }\r
 \r
     for (DnsServerIndex = 0; DnsServerIndex < Private->DnsServerCount; DnsServerIndex++) {\r
-      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v6), &(((EFI_IPv6_ADDRESS *) Option->Data)[DnsServerIndex]), sizeof (EFI_IPv6_ADDRESS));\r
+      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v6), &(((EFI_IPv6_ADDRESS *)Option->Data)[DnsServerIndex]), sizeof (EFI_IPv6_ADDRESS));\r
     }\r
 \r
     //\r
@@ -453,7 +469,7 @@ HttpBootDhcp6ExtractUriInfo (
     }\r
 \r
     HostNameSize = AsciiStrSize (HostName);\r
-    HostNameStr = AllocateZeroPool (HostNameSize * sizeof (CHAR16));\r
+    HostNameStr  = AllocateZeroPool (HostNameSize * sizeof (CHAR16));\r
     if (HostNameStr == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Error;\r
@@ -483,7 +499,7 @@ HttpBootDhcp6ExtractUriInfo (
              Private->BootFileUriParser,\r
              &Private->Port\r
              );\r
-  if (EFI_ERROR (Status) || Private->Port == 0) {\r
+  if (EFI_ERROR (Status) || (Private->Port == 0)) {\r
     Private->Port = 80;\r
   }\r
 \r
@@ -510,7 +526,6 @@ Error:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Discover all the boot information for boot file.\r
 \r
@@ -522,10 +537,10 @@ Error:
 **/\r
 EFI_STATUS\r
 HttpBootDiscoverBootInfo (\r
-  IN OUT HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN OUT HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Start D.O.R.A/S.A.R.R exchange to acquire station ip address and\r
@@ -558,24 +573,26 @@ HttpBootDiscoverBootInfo (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootHttpIoCallback (\r
-  IN  HTTP_IO_CALLBACK_EVENT    EventType,\r
-  IN  EFI_HTTP_MESSAGE          *Message,\r
-  IN  VOID                      *Context\r
+  IN  HTTP_IO_CALLBACK_EVENT  EventType,\r
+  IN  EFI_HTTP_MESSAGE        *Message,\r
+  IN  VOID                    *Context\r
   )\r
 {\r
-  HTTP_BOOT_PRIVATE_DATA       *Private;\r
-  EFI_STATUS                   Status;\r
-  Private = (HTTP_BOOT_PRIVATE_DATA *) Context;\r
+  HTTP_BOOT_PRIVATE_DATA  *Private;\r
+  EFI_STATUS              Status;\r
+\r
+  Private = (HTTP_BOOT_PRIVATE_DATA *)Context;\r
   if (Private->HttpBootCallback != NULL) {\r
     Status = Private->HttpBootCallback->Callback (\r
-               Private->HttpBootCallback,\r
-               EventType == HttpIoRequest ? HttpBootHttpRequest : HttpBootHttpResponse,\r
-               EventType == HttpIoRequest ? FALSE : TRUE,\r
-               sizeof (EFI_HTTP_MESSAGE),\r
-               (VOID *) Message\r
-               );\r
+                                          Private->HttpBootCallback,\r
+                                          EventType == HttpIoRequest ? HttpBootHttpRequest : HttpBootHttpResponse,\r
+                                          EventType == HttpIoRequest ? FALSE : TRUE,\r
+                                          sizeof (EFI_HTTP_MESSAGE),\r
+                                          (VOID *)Message\r
+                                          );\r
     return Status;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -590,13 +607,13 @@ HttpBootHttpIoCallback (
 **/\r
 EFI_STATUS\r
 HttpBootCreateHttpIo (\r
-  IN     HTTP_BOOT_PRIVATE_DATA       *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  HTTP_IO_CONFIG_DATA          ConfigData;\r
-  EFI_STATUS                   Status;\r
-  EFI_HANDLE                   ImageHandle;\r
-  UINT32                       TimeoutValue;\r
+  HTTP_IO_CONFIG_DATA  ConfigData;\r
+  EFI_STATUS           Status;\r
+  EFI_HANDLE           ImageHandle;\r
+  UINT32               TimeoutValue;\r
 \r
   ASSERT (Private != NULL);\r
 \r
@@ -625,7 +642,7 @@ HttpBootCreateHttpIo (
              Private->UsingIpv6 ? IP_VERSION_6 : IP_VERSION_4,\r
              &ConfigData,\r
              HttpBootHttpIoCallback,\r
-             (VOID *) Private,\r
+             (VOID *)Private,\r
              &Private->HttpIo\r
              );\r
   if (EFI_ERROR (Status)) {\r
@@ -644,13 +661,13 @@ HttpBootCreateHttpIo (
 **/\r
 VOID\r
 HttpBootFreeCache (\r
-  IN  HTTP_BOOT_CACHE_CONTENT    *Cache\r
+  IN  HTTP_BOOT_CACHE_CONTENT  *Cache\r
   )\r
 {\r
-  UINTN                       Index;\r
-  LIST_ENTRY                  *Entry;\r
-  LIST_ENTRY                  *NextEntry;\r
-  HTTP_BOOT_ENTITY_DATA       *EntityData;\r
+  UINTN                  Index;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *NextEntry;\r
+  HTTP_BOOT_ENTITY_DATA  *EntityData;\r
 \r
   if (Cache != NULL) {\r
     //\r
@@ -660,6 +677,7 @@ HttpBootFreeCache (
       if (Cache->RequestData->Url != NULL) {\r
         FreePool (Cache->RequestData->Url);\r
       }\r
+\r
       FreePool (Cache->RequestData);\r
     }\r
 \r
@@ -672,6 +690,7 @@ HttpBootFreeCache (
           FreePool (Cache->ResponseData->Headers[Index].FieldName);\r
           FreePool (Cache->ResponseData->Headers[Index].FieldValue);\r
         }\r
+\r
         FreePool (Cache->ResponseData->Headers);\r
       }\r
     }\r
@@ -684,6 +703,7 @@ HttpBootFreeCache (
       if (EntityData->Block != NULL) {\r
         FreePool (EntityData->Block);\r
       }\r
+\r
       RemoveEntryList (&EntityData->Link);\r
       FreePool (EntityData);\r
     }\r
@@ -700,12 +720,12 @@ HttpBootFreeCache (
 **/\r
 VOID\r
 HttpBootFreeCacheList (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  LIST_ENTRY                  *Entry;\r
-  LIST_ENTRY                  *NextEntry;\r
-  HTTP_BOOT_CACHE_CONTENT     *Cache;\r
+  LIST_ENTRY               *Entry;\r
+  LIST_ENTRY               *NextEntry;\r
+  HTTP_BOOT_CACHE_CONTENT  *Cache;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->CacheList) {\r
     Cache = NET_LIST_USER_STRUCT (Entry, HTTP_BOOT_CACHE_CONTENT, Link);\r
@@ -734,20 +754,20 @@ HttpBootFreeCacheList (
 **/\r
 EFI_STATUS\r
 HttpBootGetFileFromCache (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN     CHAR16                   *Uri,\r
-  IN OUT UINTN                    *BufferSize,\r
-     OUT UINT8                    *Buffer,\r
-     OUT HTTP_BOOT_IMAGE_TYPE     *ImageType\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN     CHAR16                  *Uri,\r
+  IN OUT UINTN                   *BufferSize,\r
+  OUT UINT8                      *Buffer,\r
+  OUT HTTP_BOOT_IMAGE_TYPE       *ImageType\r
   )\r
 {\r
-  LIST_ENTRY                  *Entry;\r
-  LIST_ENTRY                  *Entry2;\r
-  HTTP_BOOT_CACHE_CONTENT     *Cache;\r
-  HTTP_BOOT_ENTITY_DATA       *EntityData;\r
-  UINTN                       CopyedSize;\r
+  LIST_ENTRY               *Entry;\r
+  LIST_ENTRY               *Entry2;\r
+  HTTP_BOOT_CACHE_CONTENT  *Cache;\r
+  HTTP_BOOT_ENTITY_DATA    *EntityData;\r
+  UINTN                    CopyedSize;\r
 \r
-  if (Uri == NULL || BufferSize == NULL || Buffer == NULL || ImageType == NULL) {\r
+  if ((Uri == NULL) || (BufferSize == NULL) || (Buffer == NULL) || (ImageType == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -758,11 +778,12 @@ HttpBootGetFileFromCache (
     //\r
     if ((Cache->RequestData != NULL) &&\r
         (Cache->RequestData->Url != NULL) &&\r
-        (StrCmp (Uri, Cache->RequestData->Url) == 0)) {\r
+        (StrCmp (Uri, Cache->RequestData->Url) == 0))\r
+    {\r
       //\r
       // Hit in cache, record image type.\r
       //\r
-      *ImageType  = Cache->ImageType;\r
+      *ImageType = Cache->ImageType;\r
 \r
       //\r
       // Check buffer size.\r
@@ -813,16 +834,16 @@ HttpBootGetFileFromCache (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootGetBootFileCallback (\r
-  IN HTTP_BODY_PARSE_EVENT      EventType,\r
-  IN CHAR8                      *Data,\r
-  IN UINTN                      Length,\r
-  IN VOID                       *Context\r
+  IN HTTP_BODY_PARSE_EVENT  EventType,\r
+  IN CHAR8                  *Data,\r
+  IN UINTN                  Length,\r
+  IN VOID                   *Context\r
   )\r
 {\r
-  HTTP_BOOT_CALLBACK_DATA      *CallbackData;\r
-  HTTP_BOOT_ENTITY_DATA        *NewEntityData;\r
-  EFI_STATUS                   Status;\r
-  EFI_HTTP_BOOT_CALLBACK_PROTOCOL   *HttpBootCallback;\r
+  HTTP_BOOT_CALLBACK_DATA          *CallbackData;\r
+  HTTP_BOOT_ENTITY_DATA            *NewEntityData;\r
+  EFI_STATUS                       Status;\r
+  EFI_HTTP_BOOT_CALLBACK_PROTOCOL  *HttpBootCallback;\r
 \r
   //\r
   // We only care about the entity data.\r
@@ -831,20 +852,21 @@ HttpBootGetBootFileCallback (
     return EFI_SUCCESS;\r
   }\r
 \r
-  CallbackData = (HTTP_BOOT_CALLBACK_DATA *) Context;\r
+  CallbackData     = (HTTP_BOOT_CALLBACK_DATA *)Context;\r
   HttpBootCallback = CallbackData->Private->HttpBootCallback;\r
   if (HttpBootCallback != NULL) {\r
     Status = HttpBootCallback->Callback (\r
-               HttpBootCallback,\r
-               HttpBootHttpEntityBody,\r
-               TRUE,\r
-               (UINT32)Length,\r
-               Data\r
-               );\r
+                                 HttpBootCallback,\r
+                                 HttpBootHttpEntityBody,\r
+                                 TRUE,\r
+                                 (UINT32)Length,\r
+                                 Data\r
+                                 );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   }\r
+\r
   //\r
   // Copy data if caller has provided a buffer.\r
   //\r
@@ -865,14 +887,17 @@ HttpBootGetBootFileCallback (
     if (NewEntityData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     if (CallbackData->NewBlock) {\r
       NewEntityData->Block = CallbackData->Block;\r
-      CallbackData->Block = NULL;\r
+      CallbackData->Block  = NULL;\r
     }\r
+\r
     NewEntityData->DataLength = Length;\r
-    NewEntityData->DataStart  = (UINT8*) Data;\r
+    NewEntityData->DataStart  = (UINT8 *)Data;\r
     InsertTailList (&CallbackData->Cache->EntityDataList, &NewEntityData->Link);\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -902,39 +927,39 @@ HttpBootGetBootFileCallback (
 **/\r
 EFI_STATUS\r
 HttpBootGetBootFile (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN     BOOLEAN                  HeaderOnly,\r
-  IN OUT UINTN                    *BufferSize,\r
-     OUT UINT8                    *Buffer,\r
-     OUT HTTP_BOOT_IMAGE_TYPE     *ImageType\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN     BOOLEAN                 HeaderOnly,\r
+  IN OUT UINTN                   *BufferSize,\r
+  OUT UINT8                      *Buffer,\r
+  OUT HTTP_BOOT_IMAGE_TYPE       *ImageType\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_HTTP_STATUS_CODE       StatusCode;\r
-  CHAR8                      *HostName;\r
-  EFI_HTTP_REQUEST_DATA      *RequestData;\r
-  HTTP_IO_RESPONSE_DATA      *ResponseData;\r
-  HTTP_IO_RESPONSE_DATA      ResponseBody;\r
-  HTTP_IO                    *HttpIo;\r
-  HTTP_IO_HEADER             *HttpIoHeader;\r
-  VOID                       *Parser;\r
-  HTTP_BOOT_CALLBACK_DATA    Context;\r
-  UINTN                      ContentLength;\r
-  HTTP_BOOT_CACHE_CONTENT    *Cache;\r
-  UINT8                      *Block;\r
-  UINTN                      UrlSize;\r
-  CHAR16                     *Url;\r
-  BOOLEAN                    IdentityMode;\r
-  UINTN                      ReceivedSize;\r
+  EFI_STATUS               Status;\r
+  EFI_HTTP_STATUS_CODE     StatusCode;\r
+  CHAR8                    *HostName;\r
+  EFI_HTTP_REQUEST_DATA    *RequestData;\r
+  HTTP_IO_RESPONSE_DATA    *ResponseData;\r
+  HTTP_IO_RESPONSE_DATA    ResponseBody;\r
+  HTTP_IO                  *HttpIo;\r
+  HTTP_IO_HEADER           *HttpIoHeader;\r
+  VOID                     *Parser;\r
+  HTTP_BOOT_CALLBACK_DATA  Context;\r
+  UINTN                    ContentLength;\r
+  HTTP_BOOT_CACHE_CONTENT  *Cache;\r
+  UINT8                    *Block;\r
+  UINTN                    UrlSize;\r
+  CHAR16                   *Url;\r
+  BOOLEAN                  IdentityMode;\r
+  UINTN                    ReceivedSize;\r
 \r
   ASSERT (Private != NULL);\r
   ASSERT (Private->HttpCreated);\r
 \r
-  if (BufferSize == NULL || ImageType == NULL) {\r
+  if ((BufferSize == NULL) || (ImageType == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (*BufferSize != 0 && Buffer == NULL) {\r
+  if ((*BufferSize != 0) && (Buffer == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -942,12 +967,13 @@ HttpBootGetBootFile (
   // First, check whether we already cached the requested Uri.\r
   //\r
   UrlSize = AsciiStrSize (Private->BootFileUri);\r
-  Url = AllocatePool (UrlSize * sizeof (CHAR16));\r
+  Url     = AllocatePool (UrlSize * sizeof (CHAR16));\r
   if (Url == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   AsciiStrToUnicodeStrS (Private->BootFileUri, Url, UrlSize);\r
-  if (!HeaderOnly && Buffer != NULL) {\r
+  if (!HeaderOnly && (Buffer != NULL)) {\r
     Status = HttpBootGetFileFromCache (Private, Url, BufferSize, Buffer, ImageType);\r
     if (Status != EFI_NOT_FOUND) {\r
       FreePool (Url);\r
@@ -969,6 +995,7 @@ HttpBootGetBootFile (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ERROR_1;\r
     }\r
+\r
     Cache->ImageType = ImageTypeMax;\r
     InitializeListHead (&Cache->EntityDataList);\r
   }\r
@@ -993,14 +1020,15 @@ HttpBootGetBootFile (
   // Add HTTP header field 1: Host\r
   //\r
   HostName = NULL;\r
-  Status = HttpUrlGetHostName (\r
-             Private->BootFileUri,\r
-             Private->BootFileUriParser,\r
-             &HostName\r
-             );\r
+  Status   = HttpUrlGetHostName (\r
+               Private->BootFileUri,\r
+               Private->BootFileUriParser,\r
+               &HostName\r
+               );\r
   if (EFI_ERROR (Status)) {\r
     goto ERROR_3;\r
   }\r
+\r
   Status = HttpIoSetHeader (\r
              HttpIoHeader,\r
              HTTP_HEADER_HOST,\r
@@ -1043,8 +1071,9 @@ HttpBootGetBootFile (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ERROR_3;\r
   }\r
+\r
   RequestData->Method = HeaderOnly ? HttpMethodHead : HttpMethodGet;\r
-  RequestData->Url = Url;\r
+  RequestData->Url    = Url;\r
 \r
   //\r
   // 2.3 Record the request info in a temp cache item.\r
@@ -1064,7 +1093,7 @@ HttpBootGetBootFile (
              HttpIoHeader->Headers,\r
              0,\r
              NULL\r
-            );\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ERROR_4;\r
   }\r
@@ -1076,11 +1105,12 @@ HttpBootGetBootFile (
   //\r
   // 3.1 First step, use zero BodyLength to only receive the response headers.\r
   //\r
-  ResponseData = AllocateZeroPool (sizeof(HTTP_IO_RESPONSE_DATA));\r
+  ResponseData = AllocateZeroPool (sizeof (HTTP_IO_RESPONSE_DATA));\r
   if (ResponseData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ERROR_4;\r
   }\r
+\r
   Status = HttpIoRecvResponse (\r
              &Private->HttpIo,\r
              TRUE,\r
@@ -1092,6 +1122,7 @@ HttpBootGetBootFile (
       HttpBootPrintErrorMessage (StatusCode);\r
       Status = ResponseData->Status;\r
     }\r
+\r
     goto ERROR_5;\r
   }\r
 \r
@@ -1114,13 +1145,13 @@ HttpBootGetBootFile (
   //\r
   if (Cache != NULL) {\r
     Cache->ResponseData = ResponseData;\r
-    Cache->ImageType = *ImageType;\r
+    Cache->ImageType    = *ImageType;\r
   }\r
 \r
   //\r
   // 3.3 Init a message-body parser from the header information.\r
   //\r
-  Parser = NULL;\r
+  Parser             = NULL;\r
   Context.NewBlock   = FALSE;\r
   Context.Block      = NULL;\r
   Context.CopyedSize = 0;\r
@@ -1128,15 +1159,15 @@ HttpBootGetBootFile (
   Context.BufferSize = *BufferSize;\r
   Context.Cache      = Cache;\r
   Context.Private    = Private;\r
-  Status = HttpInitMsgParser (\r
-             HeaderOnly ? HttpMethodHead : HttpMethodGet,\r
-             ResponseData->Response.StatusCode,\r
-             ResponseData->HeaderCount,\r
-             ResponseData->Headers,\r
-             HttpBootGetBootFileCallback,\r
-             (VOID*) &Context,\r
-             &Parser\r
-             );\r
+  Status             = HttpInitMsgParser (\r
+                         HeaderOnly ? HttpMethodHead : HttpMethodGet,\r
+                         ResponseData->Response.StatusCode,\r
+                         ResponseData->HeaderCount,\r
+                         ResponseData->Headers,\r
+                         HttpBootGetBootFileCallback,\r
+                         (VOID *)&Context,\r
+                         &Parser\r
+                         );\r
   if (EFI_ERROR (Status)) {\r
     goto ERROR_6;\r
   }\r
@@ -1150,7 +1181,7 @@ HttpBootGetBootFile (
     // 3.4.1, check whether we are in identity transfer-coding.\r
     //\r
     ContentLength = 0;\r
-    Status = HttpGetEntityLength (Parser, &ContentLength);\r
+    Status        = HttpGetEntityLength (Parser, &ContentLength);\r
     if (!EFI_ERROR (Status)) {\r
       IdentityMode = TRUE;\r
     } else {\r
@@ -1169,28 +1200,30 @@ HttpBootGetBootFile (
       //\r
       ReceivedSize = 0;\r
       while (ReceivedSize < ContentLength) {\r
-        ResponseBody.Body       = (CHAR8*) Buffer + ReceivedSize;\r
+        ResponseBody.Body       = (CHAR8 *)Buffer + ReceivedSize;\r
         ResponseBody.BodyLength = *BufferSize - ReceivedSize;\r
-        Status = HttpIoRecvResponse (\r
-                   &Private->HttpIo,\r
-                   FALSE,\r
-                   &ResponseBody\r
-                   );\r
+        Status                  = HttpIoRecvResponse (\r
+                                    &Private->HttpIo,\r
+                                    FALSE,\r
+                                    &ResponseBody\r
+                                    );\r
         if (EFI_ERROR (Status) || EFI_ERROR (ResponseBody.Status)) {\r
           if (EFI_ERROR (ResponseBody.Status)) {\r
             Status = ResponseBody.Status;\r
           }\r
+\r
           goto ERROR_6;\r
         }\r
+\r
         ReceivedSize += ResponseBody.BodyLength;\r
         if (Private->HttpBootCallback != NULL) {\r
           Status = Private->HttpBootCallback->Callback (\r
-                     Private->HttpBootCallback,\r
-                     HttpBootHttpEntityBody,\r
-                     TRUE,\r
-                     (UINT32)ResponseBody.BodyLength,\r
-                     ResponseBody.Body\r
-                     );\r
+                                                Private->HttpBootCallback,\r
+                                                HttpBootHttpEntityBody,\r
+                                                TRUE,\r
+                                                (UINT32)ResponseBody.BodyLength,\r
+                                                ResponseBody.Body\r
+                                                );\r
           if (EFI_ERROR (Status)) {\r
             goto ERROR_6;\r
           }\r
@@ -1209,29 +1242,31 @@ HttpBootGetBootFile (
         // Otherwise a buffer, the buffer in Block will be cached and we should allocate a new before\r
         // every HttpIoRecvResponse().\r
         //\r
-        if (Block == NULL || Context.BufferSize == 0) {\r
+        if ((Block == NULL) || (Context.BufferSize == 0)) {\r
           Block = AllocatePool (HTTP_BOOT_BLOCK_SIZE);\r
           if (Block == NULL) {\r
             Status = EFI_OUT_OF_RESOURCES;\r
             goto ERROR_6;\r
           }\r
+\r
           Context.NewBlock = TRUE;\r
-          Context.Block = Block;\r
+          Context.Block    = Block;\r
         } else {\r
           Context.NewBlock = FALSE;\r
         }\r
 \r
-        ResponseBody.Body       = (CHAR8*) Block;\r
+        ResponseBody.Body       = (CHAR8 *)Block;\r
         ResponseBody.BodyLength = HTTP_BOOT_BLOCK_SIZE;\r
-        Status = HttpIoRecvResponse (\r
-                   &Private->HttpIo,\r
-                   FALSE,\r
-                   &ResponseBody\r
-                   );\r
+        Status                  = HttpIoRecvResponse (\r
+                                    &Private->HttpIo,\r
+                                    FALSE,\r
+                                    &ResponseBody\r
+                                    );\r
         if (EFI_ERROR (Status) || EFI_ERROR (ResponseBody.Status)) {\r
           if (EFI_ERROR (ResponseBody.Status)) {\r
             Status = ResponseBody.Status;\r
           }\r
+\r
           goto ERROR_6;\r
         }\r
 \r
@@ -1263,6 +1298,7 @@ HttpBootGetBootFile (
   } else {\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   *BufferSize = ContentLength;\r
 \r
   //\r
@@ -1283,25 +1319,30 @@ ERROR_6:
   if (Parser != NULL) {\r
     HttpFreeMsgParser (Parser);\r
   }\r
+\r
   if (Context.Block != NULL) {\r
     FreePool (Context.Block);\r
   }\r
+\r
   HttpBootFreeCache (Cache);\r
 \r
 ERROR_5:\r
   if (ResponseData != NULL) {\r
     FreePool (ResponseData);\r
   }\r
+\r
 ERROR_4:\r
   if (RequestData != NULL) {\r
     FreePool (RequestData);\r
   }\r
+\r
 ERROR_3:\r
   HttpIoFreeHeader (HttpIoHeader);\r
 ERROR_2:\r
   if (Cache != NULL) {\r
     FreePool (Cache);\r
   }\r
+\r
 ERROR_1:\r
   if (Url != NULL) {\r
     FreePool (Url);\r