]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/DnsDxe/DnsDriver.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / DnsDxe / DnsDriver.c
index 4db0c6bdd1eb4f715d5f50f31558716233fc0f2b..466c64046f58d6ac61dc164d7584168b2b337eb6 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "DnsImpl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gDns4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDns4DriverBinding = {\r
   Dns4DriverBindingSupported,\r
   Dns4DriverBindingStart,\r
   Dns4DriverBindingStop,\r
@@ -17,7 +17,7 @@ EFI_DRIVER_BINDING_PROTOCOL gDns4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gDns6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDns6DriverBinding = {\r
   Dns6DriverBindingSupported,\r
   Dns6DriverBindingStart,\r
   Dns6DriverBindingStop,\r
@@ -26,17 +26,17 @@ EFI_DRIVER_BINDING_PROTOCOL gDns6DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mDns4ServiceBinding = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mDns4ServiceBinding = {\r
   Dns4ServiceBindingCreateChild,\r
   Dns4ServiceBindingDestroyChild\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mDns6ServiceBinding = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mDns6ServiceBinding = {\r
   Dns6ServiceBindingCreateChild,\r
   Dns6ServiceBindingDestroyChild\r
 };\r
 \r
-DNS_DRIVER_DATA          *mDriverData = NULL;\r
+DNS_DRIVER_DATA  *mDriverData = NULL;\r
 \r
 /**\r
   Destroy the DNS instance and recycle the resources.\r
@@ -46,7 +46,7 @@ DNS_DRIVER_DATA          *mDriverData = NULL;
 **/\r
 VOID\r
 DnsDestroyInstance (\r
-  IN DNS_INSTANCE         *Instance\r
+  IN DNS_INSTANCE  *Instance\r
   )\r
 {\r
   ZeroMem (&Instance->Dns4CfgData, sizeof (EFI_DNS4_CONFIG_DATA));\r
@@ -61,7 +61,7 @@ DnsDestroyInstance (
     Dns6InstanceCancelToken (Instance, NULL);\r
   }\r
 \r
-  if (Instance->UdpIo!= NULL) {\r
+  if (Instance->UdpIo != NULL) {\r
     UdpIoFreeIo (Instance->UdpIo);\r
   }\r
 \r
@@ -80,11 +80,11 @@ DnsDestroyInstance (
 **/\r
 EFI_STATUS\r
 DnsCreateInstance (\r
-  IN  DNS_SERVICE         *Service,\r
-  OUT DNS_INSTANCE        **Instance\r
+  IN  DNS_SERVICE   *Service,\r
+  OUT DNS_INSTANCE  **Instance\r
   )\r
 {\r
-  DNS_INSTANCE            *DnsIns;\r
+  DNS_INSTANCE  *DnsIns;\r
 \r
   *Instance = NULL;\r
 \r
@@ -137,8 +137,8 @@ DnsCreateInstance (
 EFI_STATUS\r
 EFIAPI\r
 DnsDestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   DNS_INSTANCE                  *Instance;\r
@@ -146,14 +146,14 @@ DnsDestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, DNS_INSTANCE, Link, DNS_INSTANCE_SIGNATURE);\r
-  ServiceBinding    = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  Instance          = NET_LIST_USER_STRUCT_S (Entry, DNS_INSTANCE, Link, DNS_INSTANCE_SIGNATURE);\r
+  ServiceBinding    = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (Instance->ChildHandle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -177,8 +177,8 @@ DnsDestroyChildEntryInHandleBuffer (
 EFI_STATUS\r
 EFIAPI\r
 DnsConfigNullUdp (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -192,7 +192,7 @@ DnsConfigNullUdp (
 **/\r
 VOID\r
 DnsDestroyService (\r
-  IN DNS_SERVICE     *DnsSb\r
+  IN DNS_SERVICE  *DnsSb\r
   )\r
 {\r
   UdpIoFreeIo (DnsSb->ConnectUdp);\r
@@ -227,19 +227,19 @@ DnsDestroyService (
 **/\r
 EFI_STATUS\r
 DnsCreateService (\r
-  IN     EFI_HANDLE            Controller,\r
-  IN     EFI_HANDLE            Image,\r
-  IN     UINT8                 IpVersion,\r
-     OUT DNS_SERVICE           **Service\r
+  IN     EFI_HANDLE  Controller,\r
+  IN     EFI_HANDLE  Image,\r
+  IN     UINT8       IpVersion,\r
+  OUT DNS_SERVICE    **Service\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  DNS_SERVICE            *DnsSb;\r
+  EFI_STATUS   Status;\r
+  DNS_SERVICE  *DnsSb;\r
 \r
-  Status    = EFI_SUCCESS;\r
-  DnsSb     = NULL;\r
+  Status = EFI_SUCCESS;\r
+  DnsSb  = NULL;\r
 \r
-  *Service  = NULL;\r
+  *Service = NULL;\r
 \r
   DnsSb = AllocateZeroPool (sizeof (DNS_SERVICE));\r
   if (DnsSb == NULL) {\r
@@ -263,11 +263,11 @@ DnsCreateService (
   DnsSb->ControllerHandle = Controller;\r
   DnsSb->ImageHandle      = Image;\r
 \r
-  DnsSb->TimerToGetMap    = NULL;\r
+  DnsSb->TimerToGetMap = NULL;\r
 \r
-  DnsSb->Timer            = NULL;\r
+  DnsSb->Timer = NULL;\r
 \r
-  DnsSb->IpVersion        = IpVersion;\r
+  DnsSb->IpVersion = IpVersion;\r
 \r
   //\r
   // Create the timer used to time out the procedure which is used to\r
@@ -299,6 +299,7 @@ DnsCreateService (
     if (DnsSb->TimerToGetMap != NULL) {\r
       gBS->CloseEvent (DnsSb->TimerToGetMap);\r
     }\r
+\r
     FreePool (DnsSb);\r
     return Status;\r
   }\r
@@ -315,6 +316,7 @@ DnsCreateService (
     if (DnsSb->TimerToGetMap != NULL) {\r
       gBS->CloseEvent (DnsSb->TimerToGetMap);\r
     }\r
+\r
     gBS->CloseEvent (DnsSb->Timer);\r
     FreePool (DnsSb);\r
     return EFI_DEVICE_ERROR;\r
@@ -341,11 +343,11 @@ DnsUnload (
 {\r
   EFI_STATUS  Status;\r
 \r
-  LIST_ENTRY                      *Entry;\r
-  DNS4_CACHE                      *ItemCache4;\r
-  DNS4_SERVER_IP                  *ItemServerIp4;\r
-  DNS6_CACHE                      *ItemCache6;\r
-  DNS6_SERVER_IP                  *ItemServerIp6;\r
+  LIST_ENTRY      *Entry;\r
+  DNS4_CACHE      *ItemCache4;\r
+  DNS4_SERVER_IP  *ItemServerIp4;\r
+  DNS6_CACHE      *ItemCache6;\r
+  DNS6_SERVER_IP  *ItemServerIp6;\r
 \r
   ItemCache4    = NULL;\r
   ItemServerIp4 = NULL;\r
@@ -355,7 +357,7 @@ DnsUnload (
   //\r
   // Disconnect the driver specified by ImageHandle\r
   //\r
-  Status = NetLibDefaultUnload(ImageHandle);\r
+  Status = NetLibDefaultUnload (ImageHandle);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -493,25 +495,25 @@ DnsDriverEntryPoint (
 \r
   return Status;\r
 \r
-  Error4:\r
-    gBS->CloseEvent (mDriverData->Timer);\r
+Error4:\r
+  gBS->CloseEvent (mDriverData->Timer);\r
 \r
-  Error3:\r
-    FreePool (mDriverData);\r
+Error3:\r
+  FreePool (mDriverData);\r
 \r
-  Error2:\r
-     EfiLibUninstallDriverBindingComponentName2 (\r
-       &gDns6DriverBinding,\r
-       &gDnsComponentName,\r
-       &gDnsComponentName2\r
-       );\r
+Error2:\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gDns6DriverBinding,\r
+    &gDnsComponentName,\r
+    &gDnsComponentName2\r
+    );\r
 \r
-  Error1:\r
-    EfiLibUninstallDriverBindingComponentName2 (\r
-      &gDns4DriverBinding,\r
-      &gDnsComponentName,\r
-      &gDnsComponentName2\r
-      );\r
+Error1:\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gDns4DriverBinding,\r
+    &gDnsComponentName,\r
+    &gDnsComponentName2\r
+    );\r
 \r
   return Status;\r
 }\r
@@ -641,8 +643,8 @@ Dns4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  DNS_SERVICE            *DnsSb;\r
-  EFI_STATUS             Status;\r
+  DNS_SERVICE  *DnsSb;\r
+  EFI_STATUS   Status;\r
 \r
   Status = DnsCreateService (ControllerHandle, This->DriverBindingHandle, IP_VERSION_4, &DnsSb);\r
   if (EFI_ERROR (Status)) {\r
@@ -712,12 +714,12 @@ Dns4DriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_SERVICE_BINDING_PROTOCOL               *ServiceBinding;\r
-  DNS_SERVICE                                *DnsSb;\r
-  EFI_HANDLE                                 NicHandle;\r
-  EFI_STATUS                                 Status;\r
-  LIST_ENTRY                                 *List;\r
-  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT    Context;\r
+  EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r
+  DNS_SERVICE                              *DnsSb;\r
+  EFI_HANDLE                               NicHandle;\r
+  EFI_STATUS                               Status;\r
+  LIST_ENTRY                               *List;\r
+  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   //\r
   // DNS driver opens UDP child, So, Controller is a UDP\r
@@ -733,7 +735,7 @@ Dns4DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiDns4ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -748,19 +750,19 @@ Dns4DriverBindingStop (
     //\r
     // Destroy the Dns child instance in ChildHandleBuffer.\r
     //\r
-    List = &DnsSb->Dns4ChildrenList;\r
+    List                      = &DnsSb->Dns4ChildrenList;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               DnsDestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  DnsDestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&DnsSb->Dns4ChildrenList)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&DnsSb->Dns4ChildrenList)) {\r
     gBS->UninstallProtocolInterface (\r
            NicHandle,\r
            &gEfiDns4ServiceBindingProtocolGuid,\r
@@ -905,8 +907,8 @@ Dns6DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  DNS_SERVICE            *DnsSb;\r
-  EFI_STATUS             Status;\r
+  DNS_SERVICE  *DnsSb;\r
+  EFI_STATUS   Status;\r
 \r
   Status = DnsCreateService (ControllerHandle, This->DriverBindingHandle, IP_VERSION_6, &DnsSb);\r
   if (EFI_ERROR (Status)) {\r
@@ -977,12 +979,12 @@ Dns6DriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_SERVICE_BINDING_PROTOCOL               *ServiceBinding;\r
-  DNS_SERVICE                                *DnsSb;\r
-  EFI_HANDLE                                 NicHandle;\r
-  EFI_STATUS                                 Status;\r
-  LIST_ENTRY                                 *List;\r
-  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT    Context;\r
+  EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r
+  DNS_SERVICE                              *DnsSb;\r
+  EFI_HANDLE                               NicHandle;\r
+  EFI_STATUS                               Status;\r
+  LIST_ENTRY                               *List;\r
+  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   //\r
   // DNS driver opens UDP child, So, Controller is a UDP\r
@@ -998,7 +1000,7 @@ Dns6DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiDns6ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1013,19 +1015,19 @@ Dns6DriverBindingStop (
     //\r
     // Destroy the Dns child instance in ChildHandleBuffer.\r
     //\r
-    List = &DnsSb->Dns6ChildrenList;\r
+    List                      = &DnsSb->Dns6ChildrenList;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               DnsDestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  DnsDestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&DnsSb->Dns6ChildrenList)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&DnsSb->Dns6ChildrenList)) {\r
     gBS->UninstallProtocolInterface (\r
            NicHandle,\r
            &gEfiDns6ServiceBindingProtocolGuid,\r
@@ -1071,11 +1073,11 @@ Dns4ServiceBindingCreateChild (
   IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  VOID                      *Udp4;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
+  VOID          *Udp4;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1087,6 +1089,7 @@ Dns4ServiceBindingCreateChild (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Instance != NULL);\r
 \r
   //\r
@@ -1110,7 +1113,7 @@ Dns4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   DnsSb->ConnectUdp->UdpHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4,\r
+                  (VOID **)&Udp4,\r
                   gDns4DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1132,7 +1135,7 @@ Dns4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Instance->UdpIo->UdpHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4,\r
+                  (VOID **)&Udp4,\r
                   gDns4DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1148,12 +1151,12 @@ Dns4ServiceBindingCreateChild (
            *ChildHandle\r
            );\r
 \r
-     gBS->UninstallMultipleProtocolInterfaces (\r
-            Instance->ChildHandle,\r
-            &gEfiDns4ProtocolGuid,\r
-            &Instance->Dns4,\r
-            NULL\r
-            );\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           Instance->ChildHandle,\r
+           &gEfiDns4ProtocolGuid,\r
+           &Instance->Dns4,\r
+           NULL\r
+           );\r
 \r
     goto ON_ERROR;\r
   }\r
@@ -1201,12 +1204,12 @@ Dns4ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_DNS4_PROTOCOL         *Dns4;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_DNS4_PROTOCOL  *Dns4;\r
+  EFI_STATUS         Status;\r
+  EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1218,7 +1221,7 @@ Dns4ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDns4ProtocolGuid,\r
-                  (VOID **) &Dns4,\r
+                  (VOID **)&Dns4,\r
                   gDns4DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1228,8 +1231,8 @@ Dns4ServiceBindingDestroyChild (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Instance  = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (Dns4);\r
-  DnsSb     = DNS_SERVICE_FROM_THIS (This);\r
+  Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (Dns4);\r
+  DnsSb    = DNS_SERVICE_FROM_THIS (This);\r
 \r
   if (Instance->Service != DnsSb) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1314,11 +1317,11 @@ Dns6ServiceBindingCreateChild (
   IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  VOID                      *Udp6;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
+  VOID          *Udp6;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1330,6 +1333,7 @@ Dns6ServiceBindingCreateChild (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Instance != NULL);\r
 \r
   //\r
@@ -1353,7 +1357,7 @@ Dns6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   DnsSb->ConnectUdp->UdpHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Udp6,\r
+                  (VOID **)&Udp6,\r
                   gDns6DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1375,7 +1379,7 @@ Dns6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Instance->UdpIo->UdpHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Udp6,\r
+                  (VOID **)&Udp6,\r
                   gDns6DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1391,12 +1395,12 @@ Dns6ServiceBindingCreateChild (
            *ChildHandle\r
            );\r
 \r
-     gBS->UninstallMultipleProtocolInterfaces (\r
-            Instance->ChildHandle,\r
-            &gEfiDns6ProtocolGuid,\r
-            &Instance->Dns6,\r
-            NULL\r
-            );\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           Instance->ChildHandle,\r
+           &gEfiDns6ProtocolGuid,\r
+           &Instance->Dns6,\r
+           NULL\r
+           );\r
 \r
     goto ON_ERROR;\r
   }\r
@@ -1444,12 +1448,12 @@ Dns6ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_DNS6_PROTOCOL         *Dns6;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_DNS6_PROTOCOL  *Dns6;\r
+  EFI_STATUS         Status;\r
+  EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1461,7 +1465,7 @@ Dns6ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDns6ProtocolGuid,\r
-                  (VOID **) &Dns6,\r
+                  (VOID **)&Dns6,\r
                   gDns6DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1471,8 +1475,8 @@ Dns6ServiceBindingDestroyChild (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Instance  = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (Dns6);\r
-  DnsSb     = DNS_SERVICE_FROM_THIS (This);\r
+  Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (Dns6);\r
+  DnsSb    = DNS_SERVICE_FROM_THIS (This);\r
 \r
   if (Instance->Service != DnsSb) {\r
     return EFI_INVALID_PARAMETER;\r