]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/HttpDxe/HttpProto.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / HttpDxe / HttpProto.c
index 227c093f20a1f021be9a7672bdeca54a7a8eca52..9457dd2623d3b54b522e5886193fe64f1802f6fe 100644 (file)
@@ -24,10 +24,10 @@ HttpCommonNotify (
   )\r
 {\r
   if ((Event == NULL) || (Context == NULL)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -39,34 +39,33 @@ HttpCommonNotify (
 VOID\r
 EFIAPI\r
 HttpTcpTransmitNotifyDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP          *Wrap;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
+  HTTP_TOKEN_WRAP  *Wrap;\r
+  HTTP_PROTOCOL    *HttpInstance;\r
 \r
   if (Context == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Wrap         = (HTTP_TOKEN_WRAP *) Context;\r
+  Wrap         = (HTTP_TOKEN_WRAP *)Context;\r
   HttpInstance = Wrap->HttpInstance;\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
-      Wrap->HttpToken->Status = Wrap->TcpWrap.Tx4Token.CompletionToken.Status;\r
-      gBS->SignalEvent (Wrap->HttpToken->Event);\r
-\r
-      //\r
-      // Free resources.\r
-      //\r
-      if (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer != NULL) {\r
-        FreePool (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer);\r
-      }\r
+    Wrap->HttpToken->Status = Wrap->TcpWrap.Tx4Token.CompletionToken.Status;\r
+    gBS->SignalEvent (Wrap->HttpToken->Event);\r
 \r
-      if (Wrap->TcpWrap.Tx4Token.CompletionToken.Event != NULL) {\r
-        gBS->CloseEvent (Wrap->TcpWrap.Tx4Token.CompletionToken.Event);\r
-      }\r
+    //\r
+    // Free resources.\r
+    //\r
+    if (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+      FreePool (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer);\r
+    }\r
 \r
+    if (Wrap->TcpWrap.Tx4Token.CompletionToken.Event != NULL) {\r
+      gBS->CloseEvent (Wrap->TcpWrap.Tx4Token.CompletionToken.Event);\r
+    }\r
   } else {\r
     Wrap->HttpToken->Status = Wrap->TcpWrap.Tx6Token.CompletionToken.Status;\r
     gBS->SignalEvent (Wrap->HttpToken->Event);\r
@@ -83,14 +82,12 @@ HttpTcpTransmitNotifyDpc (
     }\r
   }\r
 \r
-\r
   Wrap->TcpWrap.IsTxDone = TRUE;\r
 \r
   //\r
   // Check pending TxTokens and sent out.\r
   //\r
   NetMapIterate (&Wrap->HttpInstance->TxTokens, HttpTcpTransmit, NULL);\r
-\r
 }\r
 \r
 /**\r
@@ -103,8 +100,8 @@ HttpTcpTransmitNotifyDpc (
 VOID\r
 EFIAPI\r
 HttpTcpTransmitNotify (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -122,21 +119,21 @@ HttpTcpTransmitNotify (
 VOID\r
 EFIAPI\r
 HttpTcpReceiveNotifyDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP          *Wrap;\r
-  NET_MAP_ITEM             *Item;\r
-  UINTN                    Length;\r
-  EFI_STATUS               Status;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  BOOLEAN                  UsingIpv6;\r
+  HTTP_TOKEN_WRAP  *Wrap;\r
+  NET_MAP_ITEM     *Item;\r
+  UINTN            Length;\r
+  EFI_STATUS       Status;\r
+  HTTP_PROTOCOL    *HttpInstance;\r
+  BOOLEAN          UsingIpv6;\r
 \r
   if (Context == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Wrap = (HTTP_TOKEN_WRAP *) Context;\r
+  Wrap         = (HTTP_TOKEN_WRAP *)Context;\r
   HttpInstance = Wrap->HttpInstance;\r
   UsingIpv6    = HttpInstance->LocalAddressIsIPv6;\r
 \r
@@ -157,9 +154,8 @@ HttpTcpReceiveNotifyDpc (
       FreePool (Wrap);\r
       Wrap = NULL;\r
 \r
-      return ;\r
+      return;\r
     }\r
-\r
   } else {\r
     gBS->CloseEvent (Wrap->TcpWrap.Rx4Token.CompletionToken.Event);\r
     Wrap->TcpWrap.Rx4Token.CompletionToken.Event = NULL;\r
@@ -177,7 +173,7 @@ HttpTcpReceiveNotifyDpc (
       FreePool (Wrap);\r
       Wrap = NULL;\r
 \r
-      return ;\r
+      return;\r
     }\r
   }\r
 \r
@@ -186,16 +182,16 @@ HttpTcpReceiveNotifyDpc (
   //\r
   ASSERT (HttpInstance->MsgParser != NULL);\r
   if (UsingIpv6) {\r
-    Length = (UINTN) Wrap->TcpWrap.Rx6Data.FragmentTable[0].FragmentLength;\r
+    Length = (UINTN)Wrap->TcpWrap.Rx6Data.FragmentTable[0].FragmentLength;\r
   } else {\r
-    Length = (UINTN) Wrap->TcpWrap.Rx4Data.FragmentTable[0].FragmentLength;\r
+    Length = (UINTN)Wrap->TcpWrap.Rx4Data.FragmentTable[0].FragmentLength;\r
   }\r
 \r
   //\r
   // Record the CallbackData data.\r
   //\r
-  HttpInstance->CallbackData.Wrap = (VOID *) Wrap;\r
-  HttpInstance->CallbackData.ParseData = Wrap->HttpToken->Message->Body;\r
+  HttpInstance->CallbackData.Wrap            = (VOID *)Wrap;\r
+  HttpInstance->CallbackData.ParseData       = Wrap->HttpToken->Message->Body;\r
   HttpInstance->CallbackData.ParseDataLength = Length;\r
 \r
   //\r
@@ -207,7 +203,7 @@ HttpTcpReceiveNotifyDpc (
              Wrap->HttpToken->Message->Body\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (HttpIsMessageComplete (HttpInstance->MsgParser)) {\r
@@ -225,15 +221,16 @@ HttpTcpReceiveNotifyDpc (
   //\r
   if (HttpInstance->NextMsg != NULL) {\r
     Wrap->HttpToken->Message->BodyLength = HttpInstance->NextMsg -\r
-                                           (CHAR8 *) Wrap->HttpToken->Message->Body;\r
+                                           (CHAR8 *)Wrap->HttpToken->Message->Body;\r
     HttpInstance->CacheLen = Length - Wrap->HttpToken->Message->BodyLength;\r
     if (HttpInstance->CacheLen != 0) {\r
       HttpInstance->CacheBody = AllocateZeroPool (HttpInstance->CacheLen);\r
       if (HttpInstance->CacheBody == NULL) {\r
-        return ;\r
+        return;\r
       }\r
+\r
       CopyMem (HttpInstance->CacheBody, HttpInstance->NextMsg, HttpInstance->CacheLen);\r
-      HttpInstance->NextMsg = HttpInstance->CacheBody;\r
+      HttpInstance->NextMsg     = HttpInstance->CacheBody;\r
       HttpInstance->CacheOffset = 0;\r
     }\r
   }\r
@@ -243,7 +240,6 @@ HttpTcpReceiveNotifyDpc (
     NetMapRemoveItem (&Wrap->HttpInstance->RxTokens, Item, NULL);\r
   }\r
 \r
-\r
   Wrap->TcpWrap.IsRxDone = TRUE;\r
   if (UsingIpv6) {\r
     Wrap->HttpToken->Status = Wrap->TcpWrap.Rx6Token.CompletionToken.Status;\r
@@ -251,7 +247,6 @@ HttpTcpReceiveNotifyDpc (
     Wrap->HttpToken->Status = Wrap->TcpWrap.Rx4Token.CompletionToken.Status;\r
   }\r
 \r
-\r
   gBS->SignalEvent (Wrap->HttpToken->Event);\r
 \r
   //\r
@@ -273,8 +268,8 @@ HttpTcpReceiveNotifyDpc (
 VOID\r
 EFIAPI\r
 HttpTcpReceiveNotify (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -294,10 +289,10 @@ HttpTcpReceiveNotify (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpConnCloseEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     //\r
@@ -327,7 +322,6 @@ HttpCreateTcpConnCloseEvent (
     if (EFI_ERROR (Status)) {\r
       goto ERROR;\r
     }\r
-\r
   } else {\r
     //\r
     // Create events for various asynchronous operations.\r
@@ -369,7 +363,6 @@ ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Close events in the TCP connection token and TCP close token.\r
 \r
@@ -378,7 +371,7 @@ ERROR:
 **/\r
 VOID\r
 HttpCloseTcpConnCloseEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
   ASSERT (HttpInstance != NULL);\r
@@ -390,10 +383,9 @@ HttpCloseTcpConnCloseEvent (
     }\r
 \r
     if (NULL != HttpInstance->Tcp6CloseToken.CompletionToken.Event) {\r
-      gBS->CloseEvent(HttpInstance->Tcp6CloseToken.CompletionToken.Event);\r
+      gBS->CloseEvent (HttpInstance->Tcp6CloseToken.CompletionToken.Event);\r
       HttpInstance->Tcp6CloseToken.CompletionToken.Event = NULL;\r
     }\r
-\r
   } else {\r
     if (NULL != HttpInstance->Tcp4ConnToken.CompletionToken.Event) {\r
       gBS->CloseEvent (HttpInstance->Tcp4ConnToken.CompletionToken.Event);\r
@@ -401,11 +393,10 @@ HttpCloseTcpConnCloseEvent (
     }\r
 \r
     if (NULL != HttpInstance->Tcp4CloseToken.CompletionToken.Event) {\r
-      gBS->CloseEvent(HttpInstance->Tcp4CloseToken.CompletionToken.Event);\r
+      gBS->CloseEvent (HttpInstance->Tcp4CloseToken.CompletionToken.Event);\r
       HttpInstance->Tcp4CloseToken.CompletionToken.Event = NULL;\r
     }\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -419,12 +410,12 @@ HttpCloseTcpConnCloseEvent (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpTxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  HTTP_TCP_TOKEN_WRAP      *TcpWrap;\r
+  EFI_STATUS           Status;\r
+  HTTP_PROTOCOL        *HttpInstance;\r
+  HTTP_TCP_TOKEN_WRAP  *TcpWrap;\r
 \r
   HttpInstance = Wrap->HttpInstance;\r
   TcpWrap      = &Wrap->TcpWrap;\r
@@ -441,12 +432,11 @@ HttpCreateTcpTxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Tx4Data.Push = TRUE;\r
-    TcpWrap->Tx4Data.Urgent = FALSE;\r
-    TcpWrap->Tx4Data.FragmentCount = 1;\r
-    TcpWrap->Tx4Token.Packet.TxData = &Wrap->TcpWrap.Tx4Data;\r
+    TcpWrap->Tx4Data.Push                    = TRUE;\r
+    TcpWrap->Tx4Data.Urgent                  = FALSE;\r
+    TcpWrap->Tx4Data.FragmentCount           = 1;\r
+    TcpWrap->Tx4Token.Packet.TxData          = &Wrap->TcpWrap.Tx4Data;\r
     TcpWrap->Tx4Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   } else {\r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
@@ -459,12 +449,11 @@ HttpCreateTcpTxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Tx6Data.Push   = TRUE;\r
-    TcpWrap->Tx6Data.Urgent = FALSE;\r
-    TcpWrap->Tx6Data.FragmentCount  = 1;\r
-    TcpWrap->Tx6Token.Packet.TxData = &Wrap->TcpWrap.Tx6Data;\r
-    TcpWrap->Tx6Token.CompletionToken.Status =EFI_NOT_READY;\r
-\r
+    TcpWrap->Tx6Data.Push                    = TRUE;\r
+    TcpWrap->Tx6Data.Urgent                  = FALSE;\r
+    TcpWrap->Tx6Data.FragmentCount           = 1;\r
+    TcpWrap->Tx6Token.Packet.TxData          = &Wrap->TcpWrap.Tx6Data;\r
+    TcpWrap->Tx6Token.CompletionToken.Status = EFI_NOT_READY;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -481,10 +470,10 @@ HttpCreateTcpTxEvent (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpRxEventForHeader (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     Status = gBS->CreateEvent (\r
@@ -498,10 +487,9 @@ HttpCreateTcpRxEventForHeader (
       return Status;\r
     }\r
 \r
-    HttpInstance->Rx4Data.FragmentCount = 1;\r
-    HttpInstance->Rx4Token.Packet.RxData = &HttpInstance->Rx4Data;\r
+    HttpInstance->Rx4Data.FragmentCount           = 1;\r
+    HttpInstance->Rx4Token.Packet.RxData          = &HttpInstance->Rx4Data;\r
     HttpInstance->Rx4Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   } else {\r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
@@ -514,13 +502,11 @@ HttpCreateTcpRxEventForHeader (
       return Status;\r
     }\r
 \r
-    HttpInstance->Rx6Data.FragmentCount  =1;\r
-    HttpInstance->Rx6Token.Packet.RxData = &HttpInstance->Rx6Data;\r
+    HttpInstance->Rx6Data.FragmentCount           = 1;\r
+    HttpInstance->Rx6Token.Packet.RxData          = &HttpInstance->Rx6Data;\r
     HttpInstance->Rx6Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   }\r
 \r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -535,12 +521,12 @@ HttpCreateTcpRxEventForHeader (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpRxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  HTTP_TCP_TOKEN_WRAP      *TcpWrap;\r
+  EFI_STATUS           Status;\r
+  HTTP_PROTOCOL        *HttpInstance;\r
+  HTTP_TCP_TOKEN_WRAP  *TcpWrap;\r
 \r
   HttpInstance = Wrap->HttpInstance;\r
   TcpWrap      = &Wrap->TcpWrap;\r
@@ -556,10 +542,9 @@ HttpCreateTcpRxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Rx4Data.FragmentCount = 1;\r
-    TcpWrap->Rx4Token.Packet.RxData = &Wrap->TcpWrap.Rx4Data;\r
+    TcpWrap->Rx4Data.FragmentCount           = 1;\r
+    TcpWrap->Rx4Token.Packet.RxData          = &Wrap->TcpWrap.Rx4Data;\r
     TcpWrap->Rx4Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   } else {\r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
@@ -572,8 +557,8 @@ HttpCreateTcpRxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Rx6Data.FragmentCount = 1;\r
-    TcpWrap->Rx6Token.Packet.RxData = &Wrap->TcpWrap.Rx6Data;\r
+    TcpWrap->Rx6Data.FragmentCount           = 1;\r
+    TcpWrap->Rx6Token.Packet.RxData          = &Wrap->TcpWrap.Rx6Data;\r
     TcpWrap->Rx6Token.CompletionToken.Status = EFI_NOT_READY;\r
   }\r
 \r
@@ -588,13 +573,13 @@ HttpCreateTcpRxEvent (
 **/\r
 VOID\r
 HttpCloseTcpRxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  HTTP_PROTOCOL            *HttpInstance;\r
+  HTTP_PROTOCOL  *HttpInstance;\r
 \r
   ASSERT (Wrap != NULL);\r
-  HttpInstance   = Wrap->HttpInstance;\r
+  HttpInstance = Wrap->HttpInstance;\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
     if (Wrap->TcpWrap.Rx6Token.CompletionToken.Event != NULL) {\r
@@ -629,13 +614,13 @@ HttpCloseTcpRxEvent (
 **/\r
 EFI_STATUS\r
 HttpInitProtocol (\r
-  IN OUT HTTP_PROTOCOL           *HttpInstance,\r
-  IN     BOOLEAN                 IpVersion\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  IN     BOOLEAN        IpVersion\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  VOID                           *Interface;\r
-  BOOLEAN                        UsingIpv6;\r
+  EFI_STATUS  Status;\r
+  VOID        *Interface;\r
+  BOOLEAN     UsingIpv6;\r
 \r
   ASSERT (HttpInstance != NULL);\r
   UsingIpv6 = IpVersion;\r
@@ -658,7 +643,7 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp4ChildHandle,\r
                     &gEfiTcp4ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip4DriverBindingHandle,\r
                     HttpInstance->Service->ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -671,24 +656,24 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp4ChildHandle,\r
                     &gEfiTcp4ProtocolGuid,\r
-                    (VOID **) &HttpInstance->Tcp4,\r
+                    (VOID **)&HttpInstance->Tcp4,\r
                     HttpInstance->Service->Ip4DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
 \r
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Service->Tcp4ChildHandle,\r
                     &gEfiTcp4ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip4DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
   } else {\r
@@ -709,7 +694,7 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp6ChildHandle,\r
                     &gEfiTcp6ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip6DriverBindingHandle,\r
                     HttpInstance->Service->ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -722,26 +707,26 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp6ChildHandle,\r
                     &gEfiTcp6ProtocolGuid,\r
-                    (VOID **) &HttpInstance->Tcp6,\r
+                    (VOID **)&HttpInstance->Tcp6,\r
                     HttpInstance->Service->Ip6DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
 \r
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Service->Tcp6ChildHandle,\r
                     &gEfiTcp6ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip6DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
   }\r
@@ -821,7 +806,6 @@ ON_ERROR:
   }\r
 \r
   return EFI_UNSUPPORTED;\r
-\r
 }\r
 \r
 /**\r
@@ -832,7 +816,7 @@ ON_ERROR:
 **/\r
 VOID\r
 HttpCleanProtocol (\r
-  IN  HTTP_PROTOCOL          *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
   HttpCloseConnection (HttpInstance);\r
@@ -868,7 +852,7 @@ HttpCleanProtocol (
   NetMapClean (&HttpInstance->TxTokens);\r
   NetMapClean (&HttpInstance->RxTokens);\r
 \r
-  if (HttpInstance->TlsSb != NULL && HttpInstance->TlsChildHandle != NULL) {\r
+  if ((HttpInstance->TlsSb != NULL) && (HttpInstance->TlsChildHandle != NULL)) {\r
     //\r
     // Destroy the TLS instance.\r
     //\r
@@ -954,18 +938,18 @@ HttpCleanProtocol (
 **/\r
 EFI_STATUS\r
 HttpCreateConnection (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Connect to Http server\r
   //\r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
-    HttpInstance->IsTcp4ConnDone = FALSE;\r
+    HttpInstance->IsTcp4ConnDone                       = FALSE;\r
     HttpInstance->Tcp4ConnToken.CompletionToken.Status = EFI_NOT_READY;\r
-    Status = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->Tcp4ConnToken);\r
+    Status                                             = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->Tcp4ConnToken);\r
     HttpNotify (HttpEventConnectTcp, Status);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));\r
@@ -977,18 +961,17 @@ HttpCreateConnection (
     }\r
 \r
     Status = HttpInstance->Tcp4ConnToken.CompletionToken.Status;\r
-\r
   } else {\r
-    HttpInstance->IsTcp6ConnDone = FALSE;\r
+    HttpInstance->IsTcp6ConnDone                       = FALSE;\r
     HttpInstance->Tcp6ConnToken.CompletionToken.Status = EFI_NOT_READY;\r
-    Status = HttpInstance->Tcp6->Connect (HttpInstance->Tcp6, &HttpInstance->Tcp6ConnToken);\r
+    Status                                             = HttpInstance->Tcp6->Connect (HttpInstance->Tcp6, &HttpInstance->Tcp6ConnToken);\r
     HttpNotify (HttpEventConnectTcp, Status);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp6->Connect() = %r\n", Status));\r
       return Status;\r
     }\r
 \r
-    while(!HttpInstance->IsTcp6ConnDone) {\r
+    while (!HttpInstance->IsTcp6ConnDone) {\r
       HttpInstance->Tcp6->Poll (HttpInstance->Tcp6);\r
     }\r
 \r
@@ -1013,17 +996,16 @@ HttpCreateConnection (
 **/\r
 EFI_STATUS\r
 HttpCloseConnection (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (HttpInstance->State == HTTP_STATE_TCP_CONNECTED) {\r
-\r
     if (HttpInstance->LocalAddressIsIPv6) {\r
       HttpInstance->Tcp6CloseToken.AbortOnClose = TRUE;\r
       HttpInstance->IsTcp6CloseDone             = FALSE;\r
-      Status = HttpInstance->Tcp6->Close (HttpInstance->Tcp6, &HttpInstance->Tcp6CloseToken);\r
+      Status                                    = HttpInstance->Tcp6->Close (HttpInstance->Tcp6, &HttpInstance->Tcp6CloseToken);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -1031,11 +1013,10 @@ HttpCloseConnection (
       while (!HttpInstance->IsTcp6CloseDone) {\r
         HttpInstance->Tcp6->Poll (HttpInstance->Tcp6);\r
       }\r
-\r
     } else {\r
       HttpInstance->Tcp4CloseToken.AbortOnClose = TRUE;\r
       HttpInstance->IsTcp4CloseDone             = FALSE;\r
-      Status = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->Tcp4CloseToken);\r
+      Status                                    = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->Tcp4CloseToken);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -1044,7 +1025,6 @@ HttpCloseConnection (
         HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);\r
       }\r
     }\r
-\r
   }\r
 \r
   HttpInstance->State = HTTP_STATE_TCP_CLOSED;\r
@@ -1063,18 +1043,17 @@ HttpCloseConnection (
 **/\r
 EFI_STATUS\r
 HttpConfigureTcp4 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance,\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_PROTOCOL    *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_TCP4_CONFIG_DATA       *Tcp4CfgData;\r
-  EFI_TCP4_ACCESS_POINT      *Tcp4AP;\r
-  EFI_TCP4_OPTION            *Tcp4Option;\r
+  EFI_STATUS             Status;\r
+  EFI_TCP4_CONFIG_DATA   *Tcp4CfgData;\r
+  EFI_TCP4_ACCESS_POINT  *Tcp4AP;\r
+  EFI_TCP4_OPTION        *Tcp4Option;\r
 \r
   ASSERT (HttpInstance != NULL);\r
 \r
-\r
   Tcp4CfgData = &HttpInstance->Tcp4CfgData;\r
   ZeroMem (Tcp4CfgData, sizeof (EFI_TCP4_CONFIG_DATA));\r
 \r
@@ -1082,7 +1061,7 @@ HttpConfigureTcp4 (
   Tcp4CfgData->TimeToLive    = HTTP_TTL_DEAULT;\r
   Tcp4CfgData->ControlOption = &HttpInstance->Tcp4Option;\r
 \r
-  Tcp4AP = &Tcp4CfgData->AccessPoint;\r
+  Tcp4AP                    = &Tcp4CfgData->AccessPoint;\r
   Tcp4AP->UseDefaultAddress = HttpInstance->IPv4Node.UseDefaultAddress;\r
   if (!Tcp4AP->UseDefaultAddress) {\r
     IP4_COPY_ADDRESS (&Tcp4AP->StationAddress, &HttpInstance->IPv4Node.LocalAddress);\r
@@ -1094,18 +1073,18 @@ HttpConfigureTcp4 (
   Tcp4AP->ActiveFlag  = TRUE;\r
   IP4_COPY_ADDRESS (&Tcp4AP->RemoteAddress, &HttpInstance->RemoteAddr);\r
 \r
-  Tcp4Option = Tcp4CfgData->ControlOption;\r
-  Tcp4Option->ReceiveBufferSize      = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp4Option->SendBufferSize         = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp4Option->MaxSynBackLog          = HTTP_MAX_SYN_BACK_LOG;\r
-  Tcp4Option->ConnectionTimeout      = HTTP_CONNECTION_TIMEOUT;\r
-  Tcp4Option->DataRetries            = HTTP_DATA_RETRIES;\r
-  Tcp4Option->FinTimeout             = HTTP_FIN_TIMEOUT;\r
-  Tcp4Option->KeepAliveProbes        = HTTP_KEEP_ALIVE_PROBES;\r
-  Tcp4Option->KeepAliveTime          = HTTP_KEEP_ALIVE_TIME;\r
-  Tcp4Option->KeepAliveInterval      = HTTP_KEEP_ALIVE_INTERVAL;\r
-  Tcp4Option->EnableNagle            = TRUE;\r
-  Tcp4CfgData->ControlOption         = Tcp4Option;\r
+  Tcp4Option                    = Tcp4CfgData->ControlOption;\r
+  Tcp4Option->ReceiveBufferSize = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp4Option->SendBufferSize    = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp4Option->MaxSynBackLog     = HTTP_MAX_SYN_BACK_LOG;\r
+  Tcp4Option->ConnectionTimeout = HTTP_CONNECTION_TIMEOUT;\r
+  Tcp4Option->DataRetries       = HTTP_DATA_RETRIES;\r
+  Tcp4Option->FinTimeout        = HTTP_FIN_TIMEOUT;\r
+  Tcp4Option->KeepAliveProbes   = HTTP_KEEP_ALIVE_PROBES;\r
+  Tcp4Option->KeepAliveTime     = HTTP_KEEP_ALIVE_TIME;\r
+  Tcp4Option->KeepAliveInterval = HTTP_KEEP_ALIVE_INTERVAL;\r
+  Tcp4Option->EnableNagle       = TRUE;\r
+  Tcp4CfgData->ControlOption    = Tcp4Option;\r
 \r
   Status = HttpInstance->Tcp4->Configure (HttpInstance->Tcp4, Tcp4CfgData);\r
   if (EFI_ERROR (Status)) {\r
@@ -1140,14 +1119,14 @@ HttpConfigureTcp4 (
 **/\r
 EFI_STATUS\r
 HttpConfigureTcp6 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance,\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_PROTOCOL    *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  EFI_TCP6_CONFIG_DATA     *Tcp6CfgData;\r
-  EFI_TCP6_ACCESS_POINT    *Tcp6Ap;\r
-  EFI_TCP6_OPTION          *Tcp6Option;\r
+  EFI_STATUS             Status;\r
+  EFI_TCP6_CONFIG_DATA   *Tcp6CfgData;\r
+  EFI_TCP6_ACCESS_POINT  *Tcp6Ap;\r
+  EFI_TCP6_OPTION        *Tcp6Option;\r
 \r
   ASSERT (HttpInstance != NULL);\r
 \r
@@ -1158,24 +1137,24 @@ HttpConfigureTcp6 (
   Tcp6CfgData->HopLimit      = 255;\r
   Tcp6CfgData->ControlOption = &HttpInstance->Tcp6Option;\r
 \r
-  Tcp6Ap  = &Tcp6CfgData->AccessPoint;\r
+  Tcp6Ap              = &Tcp6CfgData->AccessPoint;\r
   Tcp6Ap->ActiveFlag  = TRUE;\r
   Tcp6Ap->StationPort = HttpInstance->Ipv6Node.LocalPort;\r
   Tcp6Ap->RemotePort  = HttpInstance->RemotePort;\r
   IP6_COPY_ADDRESS (&Tcp6Ap->StationAddress, &HttpInstance->Ipv6Node.LocalAddress);\r
-  IP6_COPY_ADDRESS (&Tcp6Ap->RemoteAddress , &HttpInstance->RemoteIpv6Addr);\r
-\r
-  Tcp6Option = Tcp6CfgData->ControlOption;\r
-  Tcp6Option->ReceiveBufferSize  = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp6Option->SendBufferSize     = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp6Option->MaxSynBackLog      = HTTP_MAX_SYN_BACK_LOG;\r
-  Tcp6Option->ConnectionTimeout  = HTTP_CONNECTION_TIMEOUT;\r
-  Tcp6Option->DataRetries        = HTTP_DATA_RETRIES;\r
-  Tcp6Option->FinTimeout         = HTTP_FIN_TIMEOUT;\r
-  Tcp6Option->KeepAliveProbes    = HTTP_KEEP_ALIVE_PROBES;\r
-  Tcp6Option->KeepAliveTime      = HTTP_KEEP_ALIVE_TIME;\r
-  Tcp6Option->KeepAliveInterval  = HTTP_KEEP_ALIVE_INTERVAL;\r
-  Tcp6Option->EnableNagle        = TRUE;\r
+  IP6_COPY_ADDRESS (&Tcp6Ap->RemoteAddress, &HttpInstance->RemoteIpv6Addr);\r
+\r
+  Tcp6Option                    = Tcp6CfgData->ControlOption;\r
+  Tcp6Option->ReceiveBufferSize = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp6Option->SendBufferSize    = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp6Option->MaxSynBackLog     = HTTP_MAX_SYN_BACK_LOG;\r
+  Tcp6Option->ConnectionTimeout = HTTP_CONNECTION_TIMEOUT;\r
+  Tcp6Option->DataRetries       = HTTP_DATA_RETRIES;\r
+  Tcp6Option->FinTimeout        = HTTP_FIN_TIMEOUT;\r
+  Tcp6Option->KeepAliveProbes   = HTTP_KEEP_ALIVE_PROBES;\r
+  Tcp6Option->KeepAliveTime     = HTTP_KEEP_ALIVE_TIME;\r
+  Tcp6Option->KeepAliveInterval = HTTP_KEEP_ALIVE_INTERVAL;\r
+  Tcp6Option->EnableNagle       = TRUE;\r
 \r
   Status = HttpInstance->Tcp6->Configure (HttpInstance->Tcp6, Tcp6CfgData);\r
   if (EFI_ERROR (Status)) {\r
@@ -1196,7 +1175,6 @@ HttpConfigureTcp6 (
   HttpInstance->State = HTTP_STATE_TCP_CONFIGED;\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -1212,18 +1190,17 @@ HttpConfigureTcp6 (
 **/\r
 EFI_STATUS\r
 HttpConnectTcp4 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_TCP4_CONNECTION_STATE Tcp4State;\r
-\r
+  EFI_STATUS                 Status;\r
+  EFI_TCP4_CONNECTION_STATE  Tcp4State;\r
 \r
-  if (HttpInstance->State < HTTP_STATE_TCP_CONFIGED || HttpInstance->Tcp4 == NULL) {\r
+  if ((HttpInstance->State < HTTP_STATE_TCP_CONFIGED) || (HttpInstance->Tcp4 == NULL)) {\r
     return EFI_NOT_READY;\r
   }\r
 \r
-  Status = HttpInstance->Tcp4->GetModeData(\r
+  Status = HttpInstance->Tcp4->GetModeData (\r
                                  HttpInstance->Tcp4,\r
                                  &Tcp4State,\r
                                  NULL,\r
@@ -1231,7 +1208,7 @@ HttpConnectTcp4 (
                                  NULL,\r
                                  NULL\r
                                  );\r
-  if (EFI_ERROR(Status)){\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Tcp4 GetModeData fail - %x\n", Status));\r
     return Status;\r
   }\r
@@ -1239,11 +1216,11 @@ HttpConnectTcp4 (
   if (Tcp4State == Tcp4StateEstablished) {\r
     return EFI_SUCCESS;\r
   } else if (Tcp4State > Tcp4StateEstablished ) {\r
-    HttpCloseConnection(HttpInstance);\r
+    HttpCloseConnection (HttpInstance);\r
   }\r
 \r
   Status = HttpCreateConnection (HttpInstance);\r
-  if (EFI_ERROR(Status)){\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Tcp4 Connection fail - %x\n", Status));\r
     return Status;\r
   }\r
@@ -1305,13 +1282,13 @@ HttpConnectTcp4 (
 **/\r
 EFI_STATUS\r
 HttpConnectTcp6 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_TCP6_CONNECTION_STATE Tcp6State;\r
+  EFI_STATUS                 Status;\r
+  EFI_TCP6_CONNECTION_STATE  Tcp6State;\r
 \r
-  if (HttpInstance->State < HTTP_STATE_TCP_CONFIGED || HttpInstance->Tcp6 == NULL) {\r
+  if ((HttpInstance->State < HTTP_STATE_TCP_CONFIGED) || (HttpInstance->Tcp6 == NULL)) {\r
     return EFI_NOT_READY;\r
   }\r
 \r
@@ -1324,19 +1301,19 @@ HttpConnectTcp6 (
                                  NULL\r
                                  );\r
 \r
-  if (EFI_ERROR(Status)){\r
-     DEBUG ((DEBUG_ERROR, "Tcp6 GetModeData fail - %x\n", Status));\r
-     return Status;\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "Tcp6 GetModeData fail - %x\n", Status));\r
+    return Status;\r
   }\r
 \r
   if (Tcp6State == Tcp6StateEstablished) {\r
     return EFI_SUCCESS;\r
   } else if (Tcp6State > Tcp6StateEstablished ) {\r
-    HttpCloseConnection(HttpInstance);\r
+    HttpCloseConnection (HttpInstance);\r
   }\r
 \r
   Status = HttpCreateConnection (HttpInstance);\r
-  if (EFI_ERROR(Status)){\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Tcp6 Connection fail - %x\n", Status));\r
     return Status;\r
   }\r
@@ -1405,7 +1382,8 @@ HttpInitSession (
   IN  BOOLEAN          TlsConfigure\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
+  EFI_STATUS  Status;\r
+\r
   ASSERT (HttpInstance != NULL);\r
 \r
   //\r
@@ -1457,7 +1435,6 @@ HttpInitSession (
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -1480,27 +1457,27 @@ HttpTransmitTcp (
   IN  UINTN            TxStringLen\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_TCP4_IO_TOKEN             *Tx4Token;\r
-  EFI_TCP4_PROTOCOL             *Tcp4;\r
-  EFI_TCP6_IO_TOKEN             *Tx6Token;\r
-  EFI_TCP6_PROTOCOL             *Tcp6;\r
-  UINT8                         *TlsRecord;\r
-  UINT16                        PayloadSize;\r
-  NET_FRAGMENT                  TempFragment;\r
-  NET_FRAGMENT                  Fragment;\r
-  UINTN                         RecordCount;\r
-  UINTN                         RemainingLen;\r
-\r
-  Status                = EFI_SUCCESS;\r
-  TlsRecord             = NULL;\r
-  PayloadSize           = 0;\r
-  TempFragment.Len      = 0;\r
-  TempFragment.Bulk     = NULL;\r
-  Fragment.Len          = 0;\r
-  Fragment.Bulk         = NULL;\r
-  RecordCount           = 0;\r
-  RemainingLen          = 0;\r
+  EFI_STATUS         Status;\r
+  EFI_TCP4_IO_TOKEN  *Tx4Token;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_IO_TOKEN  *Tx6Token;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  UINT8              *TlsRecord;\r
+  UINT16             PayloadSize;\r
+  NET_FRAGMENT       TempFragment;\r
+  NET_FRAGMENT       Fragment;\r
+  UINTN              RecordCount;\r
+  UINTN              RemainingLen;\r
+\r
+  Status            = EFI_SUCCESS;\r
+  TlsRecord         = NULL;\r
+  PayloadSize       = 0;\r
+  TempFragment.Len  = 0;\r
+  TempFragment.Bulk = NULL;\r
+  Fragment.Len      = 0;\r
+  Fragment.Bulk     = NULL;\r
+  RecordCount       = 0;\r
+  RemainingLen      = 0;\r
 \r
   //\r
   // Need to encrypt data.\r
@@ -1518,7 +1495,7 @@ HttpTransmitTcp (
     //\r
     // Allocate enough buffer for all TLS ciphertext records.\r
     //\r
-    RecordCount = TxStringLen / TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH + 1;\r
+    RecordCount   = TxStringLen / TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH + 1;\r
     Fragment.Bulk = AllocateZeroPool (RecordCount * (TLS_RECORD_HEADER_LENGTH + TLS_CIPHERTEXT_RECORD_MAX_PAYLOAD_LENGTH));\r
     if (Fragment.Bulk == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
@@ -1530,12 +1507,12 @@ HttpTransmitTcp (
     //\r
     RemainingLen = TxStringLen;\r
     while (RemainingLen != 0) {\r
-      PayloadSize = (UINT16) MIN (TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH, RemainingLen);\r
+      PayloadSize = (UINT16)MIN (TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH, RemainingLen);\r
 \r
-      ((TLS_RECORD_HEADER *) TlsRecord)->ContentType = TlsContentTypeApplicationData;\r
-      ((TLS_RECORD_HEADER *) TlsRecord)->Version.Major = HttpInstance->TlsConfigData.Version.Major;\r
-      ((TLS_RECORD_HEADER *) TlsRecord)->Version.Minor = HttpInstance->TlsConfigData.Version.Minor;\r
-      ((TLS_RECORD_HEADER *) TlsRecord)->Length = PayloadSize;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->ContentType   = TlsContentTypeApplicationData;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->Version.Major = HttpInstance->TlsConfigData.Version.Major;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->Version.Minor = HttpInstance->TlsConfigData.Version.Minor;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->Length        = PayloadSize;\r
 \r
       CopyMem (TlsRecord + TLS_RECORD_HEADER_LENGTH, TxString + (TxStringLen - RemainingLen), PayloadSize);\r
 \r
@@ -1560,7 +1537,7 @@ HttpTransmitTcp (
       TempFragment.Len  = 0;\r
       TempFragment.Bulk = NULL;\r
 \r
-      RemainingLen -= (UINTN) PayloadSize;\r
+      RemainingLen -= (UINTN)PayloadSize;\r
       ZeroMem (TlsRecord, TLS_RECORD_HEADER_LENGTH + TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH);\r
     }\r
 \r
@@ -1569,46 +1546,45 @@ HttpTransmitTcp (
   }\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
-    Tcp4 = HttpInstance->Tcp4;\r
+    Tcp4     = HttpInstance->Tcp4;\r
     Tx4Token = &Wrap->TcpWrap.Tx4Token;\r
 \r
     if (HttpInstance->UseHttps) {\r
-      Tx4Token->Packet.TxData->DataLength = Fragment.Len;\r
+      Tx4Token->Packet.TxData->DataLength                      = Fragment.Len;\r
       Tx4Token->Packet.TxData->FragmentTable[0].FragmentLength = Fragment.Len;\r
-      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) Fragment.Bulk;\r
+      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)Fragment.Bulk;\r
     } else {\r
-      Tx4Token->Packet.TxData->DataLength = (UINT32) TxStringLen;\r
-      Tx4Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32) TxStringLen;\r
-      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) TxString;\r
+      Tx4Token->Packet.TxData->DataLength                      = (UINT32)TxStringLen;\r
+      Tx4Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32)TxStringLen;\r
+      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)TxString;\r
     }\r
 \r
     Tx4Token->CompletionToken.Status = EFI_NOT_READY;\r
 \r
     Wrap->TcpWrap.IsTxDone = FALSE;\r
-    Status  = Tcp4->Transmit (Tcp4, Tx4Token);\r
+    Status                 = Tcp4->Transmit (Tcp4, Tx4Token);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));\r
       goto ON_ERROR;\r
     }\r
-\r
   } else {\r
-    Tcp6 = HttpInstance->Tcp6;\r
+    Tcp6     = HttpInstance->Tcp6;\r
     Tx6Token = &Wrap->TcpWrap.Tx6Token;\r
 \r
     if (HttpInstance->UseHttps) {\r
-      Tx6Token->Packet.TxData->DataLength = Fragment.Len;\r
+      Tx6Token->Packet.TxData->DataLength                      = Fragment.Len;\r
       Tx6Token->Packet.TxData->FragmentTable[0].FragmentLength = Fragment.Len;\r
-      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) Fragment.Bulk;\r
+      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)Fragment.Bulk;\r
     } else {\r
-      Tx6Token->Packet.TxData->DataLength = (UINT32) TxStringLen;\r
-      Tx6Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32) TxStringLen;\r
-      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) TxString;\r
+      Tx6Token->Packet.TxData->DataLength                      = (UINT32)TxStringLen;\r
+      Tx6Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32)TxStringLen;\r
+      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)TxString;\r
     }\r
 \r
     Tx6Token->CompletionToken.Status = EFI_NOT_READY;\r
 \r
     Wrap->TcpWrap.IsTxDone = FALSE;\r
-    Status = Tcp6->Transmit (Tcp6, Tx6Token);\r
+    Status                 = Tcp6->Transmit (Tcp6, Tx6Token);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));\r
       goto ON_ERROR;\r
@@ -1651,18 +1627,18 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 HttpTokenExist (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  EFI_HTTP_TOKEN            *Token;\r
-  EFI_HTTP_TOKEN            *TokenInItem;\r
+  EFI_HTTP_TOKEN  *Token;\r
+  EFI_HTTP_TOKEN  *TokenInItem;\r
 \r
-  Token       = (EFI_HTTP_TOKEN *) Context;\r
-  TokenInItem = (EFI_HTTP_TOKEN *) Item->Key;\r
+  Token       = (EFI_HTTP_TOKEN *)Context;\r
+  TokenInItem = (EFI_HTTP_TOKEN *)Item->Key;\r
 \r
-  if (Token == TokenInItem || Token->Event == TokenInItem->Event) {\r
+  if ((Token == TokenInItem) || (Token->Event == TokenInItem->Event)) {\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -1683,14 +1659,14 @@ HttpTokenExist (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpNotReady (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP           *ValueInItem;\r
+  HTTP_TOKEN_WRAP  *ValueInItem;\r
 \r
-  ValueInItem = (HTTP_TOKEN_WRAP *) Item->Value;\r
+  ValueInItem = (HTTP_TOKEN_WRAP *)Item->Value;\r
 \r
   if (!ValueInItem->TcpWrap.IsTxDone) {\r
     return EFI_NOT_READY;\r
@@ -1714,21 +1690,21 @@ HttpTcpNotReady (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpTransmit (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP           *ValueInItem;\r
-  EFI_STATUS                Status;\r
-  CHAR8                     *RequestMsg;\r
-  CHAR8                     *Url;\r
-  UINTN                     UrlSize;\r
-  UINTN                     RequestMsgSize;\r
+  HTTP_TOKEN_WRAP  *ValueInItem;\r
+  EFI_STATUS       Status;\r
+  CHAR8            *RequestMsg;\r
+  CHAR8            *Url;\r
+  UINTN            UrlSize;\r
+  UINTN            RequestMsgSize;\r
 \r
   RequestMsg = NULL;\r
 \r
-  ValueInItem = (HTTP_TOKEN_WRAP *) Item->Value;\r
+  ValueInItem = (HTTP_TOKEN_WRAP *)Item->Value;\r
   if (ValueInItem->TcpWrap.IsTxDone) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -1737,7 +1713,7 @@ HttpTcpTransmit (
   // Parse the URI of the remote host.\r
   //\r
   UrlSize = StrLen (ValueInItem->HttpToken->Message->Data.Request->Url) + 1;\r
-  Url = AllocatePool (UrlSize);\r
+  Url     = AllocatePool (UrlSize);\r
   if (Url == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1748,14 +1724,14 @@ HttpTcpTransmit (
   // Create request message.\r
   //\r
   Status = HttpGenRequestMessage (\r
-                 ValueInItem->HttpToken->Message,\r
-                 Url,\r
-                 &RequestMsg,\r
-                 &RequestMsgSize\r
-                 );\r
+             ValueInItem->HttpToken->Message,\r
+             Url,\r
+             &RequestMsg,\r
+             &RequestMsgSize\r
+             );\r
   FreePool (Url);\r
 \r
-  if (EFI_ERROR (Status) || NULL == RequestMsg){\r
+  if (EFI_ERROR (Status) || (NULL == RequestMsg)) {\r
     return Status;\r
   }\r
 \r
@@ -1767,7 +1743,7 @@ HttpTcpTransmit (
   Status = HttpTransmitTcp (\r
              ValueInItem->HttpInstance,\r
              ValueInItem,\r
-             (UINT8*) RequestMsg,\r
+             (UINT8 *)RequestMsg,\r
              RequestMsgSize\r
              );\r
   FreePool (RequestMsg);\r
@@ -1789,15 +1765,15 @@ HttpTcpTransmit (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpReceive (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   //\r
   // Process the queued HTTP response.\r
   //\r
-  return HttpResponseWorker ((HTTP_TOKEN_WRAP *) Item->Value);\r
+  return HttpResponseWorker ((HTTP_TOKEN_WRAP *)Item->Value);\r
 }\r
 \r
 /**\r
@@ -1814,31 +1790,31 @@ HttpTcpReceive (
 **/\r
 EFI_STATUS\r
 HttpTcpReceiveHeader (\r
-  IN  HTTP_PROTOCOL         *HttpInstance,\r
-  IN  OUT UINTN             *SizeofHeaders,\r
-  IN  OUT UINTN             *BufferSize,\r
-  IN  EFI_EVENT             Timeout\r
+  IN  HTTP_PROTOCOL  *HttpInstance,\r
+  IN  OUT UINTN      *SizeofHeaders,\r
+  IN  OUT UINTN      *BufferSize,\r
+  IN  EFI_EVENT      Timeout\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_TCP4_IO_TOKEN             *Rx4Token;\r
-  EFI_TCP4_PROTOCOL             *Tcp4;\r
-  EFI_TCP6_IO_TOKEN             *Rx6Token;\r
-  EFI_TCP6_PROTOCOL             *Tcp6;\r
-  CHAR8                         **EndofHeader;\r
-  CHAR8                         **HttpHeaders;\r
-  CHAR8                         *Buffer;\r
-  NET_FRAGMENT                  Fragment;\r
+  EFI_STATUS         Status;\r
+  EFI_TCP4_IO_TOKEN  *Rx4Token;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_IO_TOKEN  *Rx6Token;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  CHAR8              **EndofHeader;\r
+  CHAR8              **HttpHeaders;\r
+  CHAR8              *Buffer;\r
+  NET_FRAGMENT       Fragment;\r
 \r
   ASSERT (HttpInstance != NULL);\r
 \r
-  EndofHeader = HttpInstance->EndofHeader;\r
-  HttpHeaders = HttpInstance->HttpHeaders;\r
-  Tcp4 = HttpInstance->Tcp4;\r
-  Tcp6 = HttpInstance->Tcp6;\r
-  Buffer      = NULL;\r
-  Rx4Token    = NULL;\r
-  Rx6Token    = NULL;\r
+  EndofHeader   = HttpInstance->EndofHeader;\r
+  HttpHeaders   = HttpInstance->HttpHeaders;\r
+  Tcp4          = HttpInstance->Tcp4;\r
+  Tcp6          = HttpInstance->Tcp6;\r
+  Buffer        = NULL;\r
+  Rx4Token      = NULL;\r
+  Rx6Token      = NULL;\r
   Fragment.Len  = 0;\r
   Fragment.Bulk = NULL;\r
 \r
@@ -1857,7 +1833,7 @@ HttpTcpReceiveHeader (
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     if (!HttpInstance->UseHttps) {\r
-      Rx4Token = &HttpInstance->Rx4Token;\r
+      Rx4Token                                                 = &HttpInstance->Rx4Token;\r
       Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = AllocateZeroPool (DEF_BUF_LEN);\r
       if (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -1870,10 +1846,10 @@ HttpTcpReceiveHeader (
     //\r
     while (*EndofHeader == NULL) {\r
       if (!HttpInstance->UseHttps) {\r
-        HttpInstance->IsRxDone = FALSE;\r
-        Rx4Token->Packet.RxData->DataLength = DEF_BUF_LEN;\r
+        HttpInstance->IsRxDone                                   = FALSE;\r
+        Rx4Token->Packet.RxData->DataLength                      = DEF_BUF_LEN;\r
         Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;\r
-        Status = Tcp4->Receive (Tcp4, Rx4Token);\r
+        Status                                                   = Tcp4->Receive (Tcp4, Rx4Token);\r
         if (EFI_ERROR (Status)) {\r
           DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));\r
           return Status;\r
@@ -1898,7 +1874,7 @@ HttpTcpReceiveHeader (
         }\r
 \r
         Fragment.Len  = Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength;\r
-        Fragment.Bulk = (UINT8 *) Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
+        Fragment.Bulk = (UINT8 *)Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
       } else {\r
         if (Fragment.Bulk != NULL) {\r
           FreePool (Fragment.Bulk);\r
@@ -1933,22 +1909,22 @@ HttpTcpReceiveHeader (
         Fragment.Len\r
         );\r
       *(Buffer + *BufferSize) = '\0';\r
-      *HttpHeaders   = Buffer;\r
-      *SizeofHeaders = *BufferSize;\r
+      *HttpHeaders            = Buffer;\r
+      *SizeofHeaders          = *BufferSize;\r
 \r
       //\r
       // Check whether we received end of HTTP headers.\r
       //\r
       *EndofHeader = AsciiStrStr (*HttpHeaders, HTTP_END_OF_HDR_STR);\r
-    };\r
+    }\r
 \r
     //\r
     // Free the buffer.\r
     //\r
-    if (Rx4Token != NULL && Rx4Token->Packet.RxData != NULL && Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+    if ((Rx4Token != NULL) && (Rx4Token->Packet.RxData != NULL) && (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL)) {\r
       FreePool (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
-      Fragment.Bulk = NULL;\r
+      Fragment.Bulk                                            = NULL;\r
     }\r
 \r
     if (Fragment.Bulk != NULL) {\r
@@ -1957,7 +1933,7 @@ HttpTcpReceiveHeader (
     }\r
   } else {\r
     if (!HttpInstance->UseHttps) {\r
-      Rx6Token = &HttpInstance->Rx6Token;\r
+      Rx6Token                                                 = &HttpInstance->Rx6Token;\r
       Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = AllocateZeroPool (DEF_BUF_LEN);\r
       if (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -1970,10 +1946,10 @@ HttpTcpReceiveHeader (
     //\r
     while (*EndofHeader == NULL) {\r
       if (!HttpInstance->UseHttps) {\r
-        HttpInstance->IsRxDone = FALSE;\r
-        Rx6Token->Packet.RxData->DataLength = DEF_BUF_LEN;\r
+        HttpInstance->IsRxDone                                   = FALSE;\r
+        Rx6Token->Packet.RxData->DataLength                      = DEF_BUF_LEN;\r
         Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;\r
-        Status = Tcp6->Receive (Tcp6, Rx6Token);\r
+        Status                                                   = Tcp6->Receive (Tcp6, Rx6Token);\r
         if (EFI_ERROR (Status)) {\r
           DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));\r
           return Status;\r
@@ -1998,7 +1974,7 @@ HttpTcpReceiveHeader (
         }\r
 \r
         Fragment.Len  = Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength;\r
-        Fragment.Bulk = (UINT8 *) Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
+        Fragment.Bulk = (UINT8 *)Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
       } else {\r
         if (Fragment.Bulk != NULL) {\r
           FreePool (Fragment.Bulk);\r
@@ -2033,22 +2009,22 @@ HttpTcpReceiveHeader (
         Fragment.Len\r
         );\r
       *(Buffer + *BufferSize) = '\0';\r
-      *HttpHeaders   = Buffer;\r
-      *SizeofHeaders = *BufferSize;\r
+      *HttpHeaders            = Buffer;\r
+      *SizeofHeaders          = *BufferSize;\r
 \r
       //\r
       // Check whether we received end of HTTP headers.\r
       //\r
       *EndofHeader = AsciiStrStr (*HttpHeaders, HTTP_END_OF_HDR_STR);\r
-    };\r
+    }\r
 \r
     //\r
     // Free the buffer.\r
     //\r
-    if (Rx6Token != NULL && Rx6Token->Packet.RxData != NULL && Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+    if ((Rx6Token != NULL) && (Rx6Token->Packet.RxData != NULL) && (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL)) {\r
       FreePool (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
-      Fragment.Bulk = NULL;\r
+      Fragment.Bulk                                            = NULL;\r
     }\r
 \r
     if (Fragment.Bulk != NULL) {\r
@@ -2079,22 +2055,22 @@ HttpTcpReceiveHeader (
 **/\r
 EFI_STATUS\r
 HttpTcpReceiveBody (\r
-  IN  HTTP_TOKEN_WRAP       *Wrap,\r
-  IN  EFI_HTTP_MESSAGE      *HttpMsg\r
+  IN  HTTP_TOKEN_WRAP   *Wrap,\r
+  IN  EFI_HTTP_MESSAGE  *HttpMsg\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  HTTP_PROTOCOL             *HttpInstance;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  EFI_TCP6_IO_TOKEN         *Rx6Token;\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP4_IO_TOKEN         *Rx4Token;\r
-\r
-  HttpInstance   = Wrap->HttpInstance;\r
-  Tcp4 = HttpInstance->Tcp4;\r
-  Tcp6 = HttpInstance->Tcp6;\r
-  Rx4Token       = NULL;\r
-  Rx6Token       = NULL;\r
+  EFI_STATUS         Status;\r
+  HTTP_PROTOCOL      *HttpInstance;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  EFI_TCP6_IO_TOKEN  *Rx6Token;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP4_IO_TOKEN  *Rx4Token;\r
+\r
+  HttpInstance = Wrap->HttpInstance;\r
+  Tcp4         = HttpInstance->Tcp4;\r
+  Tcp6         = HttpInstance->Tcp6;\r
+  Rx4Token     = NULL;\r
+  Rx6Token     = NULL;\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
     ASSERT (Tcp6 != NULL);\r
@@ -2103,11 +2079,11 @@ HttpTcpReceiveBody (
   }\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
-    Rx6Token = &Wrap->TcpWrap.Rx6Token;\r
-    Rx6Token ->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx6Token ->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) HttpMsg->Body;\r
-    Rx6Token->CompletionToken.Status = EFI_NOT_READY;\r
+    Rx6Token                                                 = &Wrap->TcpWrap.Rx6Token;\r
+    Rx6Token->Packet.RxData->DataLength                      = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *)HttpMsg->Body;\r
+    Rx6Token->CompletionToken.Status                         = EFI_NOT_READY;\r
 \r
     Status = Tcp6->Receive (Tcp6, Rx6Token);\r
     if (EFI_ERROR (Status)) {\r
@@ -2115,13 +2091,13 @@ HttpTcpReceiveBody (
       return Status;\r
     }\r
   } else {\r
-    Rx4Token = &Wrap->TcpWrap.Rx4Token;\r
-    Rx4Token->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) HttpMsg->Body;\r
+    Rx4Token                                                 = &Wrap->TcpWrap.Rx4Token;\r
+    Rx4Token->Packet.RxData->DataLength                      = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *)HttpMsg->Body;\r
 \r
     Rx4Token->CompletionToken.Status = EFI_NOT_READY;\r
-    Status = Tcp4->Receive (Tcp4, Rx4Token);\r
+    Status                           = Tcp4->Receive (Tcp4, Rx4Token);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));\r
       return Status;\r
@@ -2129,7 +2105,6 @@ HttpTcpReceiveBody (
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -2140,17 +2115,17 @@ HttpTcpReceiveBody (
 **/\r
 VOID\r
 HttpTcpTokenCleanup (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  EFI_TCP4_IO_TOKEN        *Rx4Token;\r
-  EFI_TCP6_IO_TOKEN        *Rx6Token;\r
+  HTTP_PROTOCOL      *HttpInstance;\r
+  EFI_TCP4_IO_TOKEN  *Rx4Token;\r
+  EFI_TCP6_IO_TOKEN  *Rx6Token;\r
 \r
   ASSERT (Wrap != NULL);\r
-  HttpInstance   = Wrap->HttpInstance;\r
-  Rx4Token       = NULL;\r
-  Rx6Token       = NULL;\r
+  HttpInstance = Wrap->HttpInstance;\r
+  Rx4Token     = NULL;\r
+  Rx6Token     = NULL;\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
     Rx6Token = &Wrap->TcpWrap.Rx6Token;\r
@@ -2173,7 +2148,6 @@ HttpTcpTokenCleanup (
       FreePool (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
     }\r
-\r
   } else {\r
     Rx4Token = &Wrap->TcpWrap.Rx4Token;\r
 \r
@@ -2191,13 +2165,11 @@ HttpTcpTokenCleanup (
       Rx4Token->CompletionToken.Event = NULL;\r
     }\r
 \r
-\r
     if (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
       FreePool (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
     }\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -2209,45 +2181,46 @@ HttpTcpTokenCleanup (
 **/\r
 VOID\r
 HttpNotify (\r
-  IN  EDKII_HTTP_CALLBACK_EVENT         Event,\r
-  IN  EFI_STATUS                        EventStatus\r
+  IN  EDKII_HTTP_CALLBACK_EVENT  Event,\r
+  IN  EFI_STATUS                 EventStatus\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      *Handles;\r
-  UINTN                           Index;\r
-  UINTN                           HandleCount;\r
-  EFI_HANDLE                      Handle;\r
-  EDKII_HTTP_CALLBACK_PROTOCOL    *HttpCallback;\r
+  EFI_STATUS                    Status;\r
+  EFI_HANDLE                    *Handles;\r
+  UINTN                         Index;\r
+  UINTN                         HandleCount;\r
+  EFI_HANDLE                    Handle;\r
+  EDKII_HTTP_CALLBACK_PROTOCOL  *HttpCallback;\r
 \r
   DEBUG ((DEBUG_INFO, "HttpNotify: Event - %d, EventStatus - %r\n", Event, EventStatus));\r
 \r
-  Handles = NULL;\r
+  Handles     = NULL;\r
   HandleCount = 0;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEdkiiHttpCallbackProtocolGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &Handles\r
-                  );\r
+  Status      = gBS->LocateHandleBuffer (\r
+                       ByProtocol,\r
+                       &gEdkiiHttpCallbackProtocolGuid,\r
+                       NULL,\r
+                       &HandleCount,\r
+                       &Handles\r
+                       );\r
   if (Status == EFI_SUCCESS) {\r
     for (Index = 0; Index < HandleCount; Index++) {\r
       Handle = Handles[Index];\r
       Status = gBS->HandleProtocol (\r
                       Handle,\r
                       &gEdkiiHttpCallbackProtocolGuid,\r
-                      (VOID **) &HttpCallback\r
+                      (VOID **)&HttpCallback\r
                       );\r
       if (Status == EFI_SUCCESS) {\r
         DEBUG ((DEBUG_INFO, "HttpNotify: Notifying %p\n", HttpCallback));\r
         HttpCallback->Callback (\r
-                HttpCallback,\r
-                Event,\r
-                EventStatus\r
-                );\r
+                        HttpCallback,\r
+                        Event,\r
+                        EventStatus\r
+                        );\r
       }\r
     }\r
+\r
     FreePool (Handles);\r
   }\r
 }\r