]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/Ip4Dxe/Ip4Config2Nv.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / Ip4Dxe / Ip4Config2Nv.c
index 63014ca3190755e2390a0a198486001d38783089..e0b6a4d4a92f132486e6c57046dc1696edb678db 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-CHAR16    mIp4Config2StorageName[]     = L"IP4_CONFIG2_IFR_NVDATA";\r
+CHAR16  mIp4Config2StorageName[] = L"IP4_CONFIG2_IFR_NVDATA";\r
 \r
 /**\r
   Calculate the prefix length of the IPv4 subnet mask.\r
@@ -48,7 +48,7 @@ GetSubnetMaskPrefixLength (
     Len++;\r
   }\r
 \r
-  return (UINT8) (32 - Len);\r
+  return (UINT8)(32 - Len);\r
 }\r
 \r
 /**\r
@@ -67,13 +67,12 @@ Ip4Config2StrToIp (
   OUT EFI_IPv4_ADDRESS  *Ip\r
   )\r
 {\r
-  UINTN Index;\r
-  UINTN Number;\r
+  UINTN  Index;\r
+  UINTN  Number;\r
 \r
   Index = 0;\r
 \r
   while (*Str != L'\0') {\r
-\r
     if (Index > 3) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -88,7 +87,7 @@ Ip4Config2StrToIp (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    Ip->Addr[Index] = (UINT8) Number;\r
+    Ip->Addr[Index] = (UINT8)Number;\r
 \r
     if ((*Str != L'\0') && (*Str != L'.')) {\r
       //\r
@@ -134,12 +133,12 @@ Ip4Config2StrToIpList (
   OUT UINTN             *IpCount\r
   )\r
 {\r
-  UINTN              BeginIndex;\r
-  UINTN              EndIndex;\r
-  UINTN              Index;\r
-  UINTN              IpIndex;\r
-  CHAR16             *StrTemp;\r
-  BOOLEAN            SpaceTag;\r
+  UINTN    BeginIndex;\r
+  UINTN    EndIndex;\r
+  UINTN    Index;\r
+  UINTN    IpIndex;\r
+  CHAR16   *StrTemp;\r
+  BOOLEAN  SpaceTag;\r
 \r
   BeginIndex = 0;\r
   EndIndex   = BeginIndex;\r
@@ -178,7 +177,7 @@ Ip4Config2StrToIpList (
   //\r
   // Allocate buffer for IpList.\r
   //\r
-  *PtrIpList = AllocateZeroPool(*IpCount * sizeof(EFI_IPv4_ADDRESS));\r
+  *PtrIpList = AllocateZeroPool (*IpCount * sizeof (EFI_IPv4_ADDRESS));\r
   if (*PtrIpList == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -189,30 +188,30 @@ Ip4Config2StrToIpList (
   Index = 0;\r
   while (*(Str + Index) != L'\0') {\r
     if (*(Str + Index) == L' ') {\r
-      if(!SpaceTag) {\r
-        StrTemp = AllocateZeroPool((EndIndex - BeginIndex + 1) * sizeof(CHAR16));\r
+      if (!SpaceTag) {\r
+        StrTemp = AllocateZeroPool ((EndIndex - BeginIndex + 1) * sizeof (CHAR16));\r
         if (StrTemp == NULL) {\r
-          FreePool(*PtrIpList);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
 \r
-        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
+        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof (CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r
 \r
         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
-          FreePool(StrTemp);\r
-          FreePool(*PtrIpList);\r
+          FreePool (StrTemp);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_INVALID_PARAMETER;\r
         }\r
 \r
         BeginIndex = EndIndex;\r
         IpIndex++;\r
 \r
-        FreePool(StrTemp);\r
+        FreePool (StrTemp);\r
       }\r
 \r
       BeginIndex++;\r
@@ -227,26 +226,26 @@ Ip4Config2StrToIpList (
 \r
     if (*(Str + Index) == L'\0') {\r
       if (!SpaceTag) {\r
-        StrTemp = AllocateZeroPool((EndIndex - BeginIndex + 1) * sizeof(CHAR16));\r
+        StrTemp = AllocateZeroPool ((EndIndex - BeginIndex + 1) * sizeof (CHAR16));\r
         if (StrTemp == NULL) {\r
-          FreePool(*PtrIpList);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
 \r
-        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
+        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof (CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r
 \r
         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
-          FreePool(StrTemp);\r
-          FreePool(*PtrIpList);\r
+          FreePool (StrTemp);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_INVALID_PARAMETER;\r
         }\r
 \r
-        FreePool(StrTemp);\r
+        FreePool (StrTemp);\r
       }\r
     }\r
   }\r
@@ -278,7 +277,6 @@ Ip4Config2IpToStr (
     );\r
 }\r
 \r
-\r
 /**\r
   Convert the IPv4 address list into string consists of several decimal\r
   dotted IPv4 addresses separated by space.\r
@@ -299,11 +297,11 @@ Ip4Config2IpListToStr (
   OUT CHAR16            *Str\r
   )\r
 {\r
-  UINTN            Index;\r
-  UINTN            TemIndex;\r
-  UINTN            StrIndex;\r
-  CHAR16           *TempStr;\r
-  EFI_IPv4_ADDRESS *TempIp;\r
+  UINTN             Index;\r
+  UINTN             TemIndex;\r
+  UINTN             StrIndex;\r
+  CHAR16            *TempStr;\r
+  EFI_IPv4_ADDRESS  *TempIp;\r
 \r
   Index    = 0;\r
   TemIndex = 0;\r
@@ -311,10 +309,10 @@ Ip4Config2IpListToStr (
   TempStr  = NULL;\r
   TempIp   = NULL;\r
 \r
-  for (Index = 0; Index < IpCount; Index ++) {\r
+  for (Index = 0; Index < IpCount; Index++) {\r
     TempIp = Ip + Index;\r
     if (TempStr == NULL) {\r
-      TempStr = AllocateZeroPool(2 * IP4_STR_MAX_SIZE);\r
+      TempStr = AllocateZeroPool (2 * IP4_STR_MAX_SIZE);\r
       if (TempStr == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
@@ -330,13 +328,14 @@ Ip4Config2IpListToStr (
       TempIp->Addr[3]\r
       );\r
 \r
-    for (TemIndex = 0; TemIndex < IP4_STR_MAX_SIZE; TemIndex ++) {\r
+    for (TemIndex = 0; TemIndex < IP4_STR_MAX_SIZE; TemIndex++) {\r
       if (*(TempStr + TemIndex) == L'\0') {\r
         if (Index == IpCount - 1) {\r
           Str[StrIndex++] = L'\0';\r
         } else {\r
           Str[StrIndex++] = L' ';\r
         }\r
+\r
         break;\r
       } else {\r
         Str[StrIndex++] = *(TempStr + TemIndex);\r
@@ -345,7 +344,7 @@ Ip4Config2IpListToStr (
   }\r
 \r
   if (TempStr != NULL) {\r
-    FreePool(TempStr);\r
+    FreePool (TempStr);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -361,11 +360,11 @@ Ip4Config2IpListToStr (
 VOID\r
 EFIAPI\r
 Ip4Config2ManualAddressNotify (\r
-  IN EFI_EVENT    Event,\r
-  IN VOID         *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -382,21 +381,21 @@ Ip4Config2ManualAddressNotify (
 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertConfigNvDataToIfrNvData (\r
-  IN     IP4_CONFIG2_INSTANCE       *Instance,\r
-  IN OUT IP4_CONFIG2_IFR_NVDATA     *IfrNvData\r
+  IN     IP4_CONFIG2_INSTANCE    *Instance,\r
+  IN OUT IP4_CONFIG2_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  IP4_SERVICE                                *IpSb;\r
-  EFI_IP4_CONFIG2_PROTOCOL                   *Ip4Config2;\r
-  EFI_IP4_CONFIG2_INTERFACE_INFO             *Ip4Info;\r
-  EFI_IP4_CONFIG2_POLICY                     Policy;\r
-  UINTN                                      DataSize;\r
-  UINTN                                      GatewaySize;\r
-  EFI_IPv4_ADDRESS                           GatewayAddress;\r
-  EFI_STATUS                                 Status;\r
-  UINTN                                      DnsSize;\r
-  UINTN                                      DnsCount;\r
-  EFI_IPv4_ADDRESS                           *DnsAddress;\r
+  IP4_SERVICE                     *IpSb;\r
+  EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2;\r
+  EFI_IP4_CONFIG2_INTERFACE_INFO  *Ip4Info;\r
+  EFI_IP4_CONFIG2_POLICY          Policy;\r
+  UINTN                           DataSize;\r
+  UINTN                           GatewaySize;\r
+  EFI_IPv4_ADDRESS                GatewayAddress;\r
+  EFI_STATUS                      Status;\r
+  UINTN                           DnsSize;\r
+  UINTN                           DnsCount;\r
+  EFI_IPv4_ADDRESS                *DnsAddress;\r
 \r
   Status      = EFI_SUCCESS;\r
   Ip4Config2  = &Instance->Ip4Config2;\r
@@ -443,13 +442,13 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   //\r
   // Get the interface info.\r
   //\r
-  DataSize    = 0;\r
-  Status = Ip4Config2->GetData (\r
-                         Ip4Config2,\r
-                         Ip4Config2DataTypeInterfaceInfo,\r
-                         &DataSize,\r
-                         NULL\r
-                         );\r
+  DataSize = 0;\r
+  Status   = Ip4Config2->GetData (\r
+                           Ip4Config2,\r
+                           Ip4Config2DataTypeInterfaceInfo,\r
+                           &DataSize,\r
+                           NULL\r
+                           );\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r
   }\r
@@ -487,20 +486,20 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   // Get the Dns info.\r
   //\r
   DnsSize = 0;\r
-  Status = Ip4Config2->GetData (\r
-                         Ip4Config2,\r
-                         Ip4Config2DataTypeDnsServer,\r
-                         &DnsSize,\r
-                         NULL\r
-                         );\r
+  Status  = Ip4Config2->GetData (\r
+                          Ip4Config2,\r
+                          Ip4Config2DataTypeDnsServer,\r
+                          &DnsSize,\r
+                          NULL\r
+                          );\r
   if ((Status != EFI_BUFFER_TOO_SMALL) && (Status != EFI_NOT_FOUND)) {\r
     goto Exit;\r
   }\r
 \r
-  DnsCount = (UINT32) (DnsSize / sizeof (EFI_IPv4_ADDRESS));\r
+  DnsCount = (UINT32)(DnsSize / sizeof (EFI_IPv4_ADDRESS));\r
 \r
   if (DnsSize > 0) {\r
-    DnsAddress = AllocateZeroPool(DnsSize);\r
+    DnsAddress = AllocateZeroPool (DnsSize);\r
     if (DnsAddress == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
@@ -525,11 +524,11 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
 Exit:\r
 \r
   if (DnsAddress != NULL) {\r
-    FreePool(DnsAddress);\r
+    FreePool (DnsAddress);\r
   }\r
 \r
   if (Ip4Info != NULL) {\r
-    FreePool(Ip4Info);\r
+    FreePool (Ip4Info);\r
   }\r
 \r
   return Status;\r
@@ -550,41 +549,39 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertIfrNvDataToConfigNvData (\r
-  IN     IP4_CONFIG2_IFR_NVDATA     *IfrFormNvData,\r
-  IN OUT IP4_CONFIG2_INSTANCE       *Instance\r
+  IN     IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData,\r
+  IN OUT IP4_CONFIG2_INSTANCE    *Instance\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_IP4_CONFIG2_PROTOCOL         *Ip4Cfg2;\r
-  IP4_CONFIG2_NVDATA               *Ip4NvData;\r
-\r
-  EFI_IP_ADDRESS                   StationAddress;\r
-  EFI_IP_ADDRESS                   SubnetMask;\r
-  EFI_IP_ADDRESS                   Gateway;\r
-  IP4_ADDR                         Ip;\r
-  EFI_IPv4_ADDRESS                 *DnsAddress;\r
-  UINTN                            DnsCount;\r
-  UINTN                            Index;\r
-\r
-  EFI_EVENT                        TimeoutEvent;\r
-  EFI_EVENT                        SetAddressEvent;\r
-  BOOLEAN                          IsAddressOk;\r
-  UINTN                            DataSize;\r
-  EFI_INPUT_KEY                    Key;\r
-\r
-  Status          = EFI_SUCCESS;\r
-  Ip4Cfg2         = &Instance->Ip4Config2;\r
-  Ip4NvData       = &Instance->Ip4NvData;\r
-\r
-  DnsCount        = 0;\r
-  DnsAddress      = NULL;\r
+  EFI_STATUS                Status;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Cfg2;\r
+  IP4_CONFIG2_NVDATA        *Ip4NvData;\r
+\r
+  EFI_IP_ADDRESS    StationAddress;\r
+  EFI_IP_ADDRESS    SubnetMask;\r
+  EFI_IP_ADDRESS    Gateway;\r
+  IP4_ADDR          Ip;\r
+  EFI_IPv4_ADDRESS  *DnsAddress;\r
+  UINTN             DnsCount;\r
+  UINTN             Index;\r
+\r
+  EFI_EVENT      TimeoutEvent;\r
+  EFI_EVENT      SetAddressEvent;\r
+  BOOLEAN        IsAddressOk;\r
+  UINTN          DataSize;\r
+  EFI_INPUT_KEY  Key;\r
+\r
+  Status    = EFI_SUCCESS;\r
+  Ip4Cfg2   = &Instance->Ip4Config2;\r
+  Ip4NvData = &Instance->Ip4NvData;\r
+\r
+  DnsCount   = 0;\r
+  DnsAddress = NULL;\r
 \r
   TimeoutEvent    = NULL;\r
   SetAddressEvent = NULL;\r
 \r
-\r
-\r
-  if (Instance == NULL || IfrFormNvData == NULL) {\r
+  if ((Instance == NULL) || (IfrFormNvData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -601,7 +598,7 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
                         sizeof (EFI_IP4_CONFIG2_POLICY),\r
                         &Ip4NvData->Policy\r
                         );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   } else {\r
@@ -618,26 +615,28 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
 \r
     Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r
     if (EFI_ERROR (Status) ||\r
-        (SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) ||\r
-        !Ip4StationAddressValid (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) {\r
+        ((SubnetMask.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) ||\r
+        !Ip4StationAddressValid (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0])))\r
+    {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
     if (EFI_ERROR (Status) ||\r
-        (Gateway.Addr[0] != 0 && SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (SubnetMask.Addr[0])))) {\r
+        ((Gateway.Addr[0] != 0) && (SubnetMask.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (SubnetMask.Addr[0]))))\r
+    {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
-    if (!EFI_ERROR (Status) && DnsCount > 0) {\r
-      for (Index = 0; Index < DnsCount; Index ++) {\r
+    if (!EFI_ERROR (Status) && (DnsCount > 0)) {\r
+      for (Index = 0; Index < DnsCount; Index++) {\r
         CopyMem (&Ip, &DnsAddress[Index], sizeof (IP4_ADDR));\r
         if (IP4_IS_UNSPECIFIED (NTOHL (Ip)) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
           CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
-          FreePool(DnsAddress);\r
+          FreePool (DnsAddress);\r
           return EFI_INVALID_PARAMETER;\r
         }\r
       }\r
@@ -648,37 +647,43 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     }\r
 \r
     if (Ip4NvData->ManualAddress != NULL) {\r
-      FreePool(Ip4NvData->ManualAddress);\r
+      FreePool (Ip4NvData->ManualAddress);\r
     }\r
+\r
     Ip4NvData->ManualAddressCount = 1;\r
-    Ip4NvData->ManualAddress = AllocateZeroPool(sizeof(EFI_IP4_CONFIG2_MANUAL_ADDRESS));\r
+    Ip4NvData->ManualAddress      = AllocateZeroPool (sizeof (EFI_IP4_CONFIG2_MANUAL_ADDRESS));\r
     if (Ip4NvData->ManualAddress == NULL) {\r
       if (DnsAddress != NULL) {\r
-        FreePool(DnsAddress);\r
+        FreePool (DnsAddress);\r
       }\r
 \r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    CopyMem(&Ip4NvData->ManualAddress->Address, &StationAddress.v4, sizeof(EFI_IPv4_ADDRESS));\r
-    CopyMem(&Ip4NvData->ManualAddress->SubnetMask, &SubnetMask.v4, sizeof(EFI_IPv4_ADDRESS));\r
+\r
+    CopyMem (&Ip4NvData->ManualAddress->Address, &StationAddress.v4, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Ip4NvData->ManualAddress->SubnetMask, &SubnetMask.v4, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     if (Ip4NvData->GatewayAddress != NULL) {\r
-      FreePool(Ip4NvData->GatewayAddress);\r
+      FreePool (Ip4NvData->GatewayAddress);\r
     }\r
+\r
     Ip4NvData->GatewayAddressCount = 1;\r
-    Ip4NvData->GatewayAddress = AllocateZeroPool(sizeof(EFI_IPv4_ADDRESS));\r
+    Ip4NvData->GatewayAddress      = AllocateZeroPool (sizeof (EFI_IPv4_ADDRESS));\r
     if (Ip4NvData->GatewayAddress == NULL) {\r
       if (DnsAddress != NULL) {\r
-        FreePool(DnsAddress);\r
+        FreePool (DnsAddress);\r
       }\r
+\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    CopyMem(Ip4NvData->GatewayAddress, &Gateway.v4, sizeof(EFI_IPv4_ADDRESS));\r
+\r
+    CopyMem (Ip4NvData->GatewayAddress, &Gateway.v4, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     if (Ip4NvData->DnsAddress != NULL) {\r
-      FreePool(Ip4NvData->DnsAddress);\r
+      FreePool (Ip4NvData->DnsAddress);\r
     }\r
-    Ip4NvData->DnsAddressCount = (UINT32) DnsCount;\r
+\r
+    Ip4NvData->DnsAddressCount = (UINT32)DnsCount;\r
     Ip4NvData->DnsAddress      = DnsAddress;\r
 \r
     //\r
@@ -690,7 +695,7 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
                         sizeof (EFI_IP4_CONFIG2_POLICY),\r
                         &Ip4NvData->Policy\r
                         );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
@@ -734,12 +739,12 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     // Set ManualAddress.\r
     //\r
     DataSize = Ip4NvData->ManualAddressCount * sizeof (EFI_IP4_CONFIG2_MANUAL_ADDRESS);\r
-    Status = Ip4Cfg2->SetData (\r
-                        Ip4Cfg2,\r
-                        Ip4Config2DataTypeManualAddress,\r
-                        DataSize,\r
-                        (VOID *) Ip4NvData->ManualAddress\r
-                        );\r
+    Status   = Ip4Cfg2->SetData (\r
+                          Ip4Cfg2,\r
+                          Ip4Config2DataTypeManualAddress,\r
+                          DataSize,\r
+                          (VOID *)Ip4NvData->ManualAddress\r
+                          );\r
 \r
     if (Status == EFI_NOT_READY) {\r
       gBS->SetTimer (TimeoutEvent, TimerRelative, 50000000);\r
@@ -764,12 +769,12 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     // Set gateway.\r
     //\r
     DataSize = Ip4NvData->GatewayAddressCount * sizeof (EFI_IPv4_ADDRESS);\r
-    Status = Ip4Cfg2->SetData (\r
-                        Ip4Cfg2,\r
-                        Ip4Config2DataTypeGateway,\r
-                        DataSize,\r
-                        Ip4NvData->GatewayAddress\r
-                        );\r
+    Status   = Ip4Cfg2->SetData (\r
+                          Ip4Cfg2,\r
+                          Ip4Config2DataTypeGateway,\r
+                          DataSize,\r
+                          Ip4NvData->GatewayAddress\r
+                          );\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
@@ -777,14 +782,14 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     //\r
     // Set DNS addresses.\r
     //\r
-    if (Ip4NvData->DnsAddressCount > 0 && Ip4NvData->DnsAddress != NULL) {\r
+    if ((Ip4NvData->DnsAddressCount > 0) && (Ip4NvData->DnsAddress != NULL)) {\r
       DataSize = Ip4NvData->DnsAddressCount * sizeof (EFI_IPv4_ADDRESS);\r
-      Status = Ip4Cfg2->SetData (\r
-                          Ip4Cfg2,\r
-                          Ip4Config2DataTypeDnsServer,\r
-                          DataSize,\r
-                          Ip4NvData->DnsAddress\r
-                          );\r
+      Status   = Ip4Cfg2->SetData (\r
+                            Ip4Cfg2,\r
+                            Ip4Config2DataTypeDnsServer,\r
+                            DataSize,\r
+                            Ip4NvData->DnsAddress\r
+                            );\r
 \r
       if (EFI_ERROR (Status)) {\r
         goto Exit;\r
@@ -863,24 +868,24 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 Ip4FormExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  IP4_CONFIG2_INSTANCE             *Ip4Config2Instance;\r
-  IP4_FORM_CALLBACK_INFO           *Private;\r
-  IP4_CONFIG2_IFR_NVDATA           *IfrFormNvData;\r
-  EFI_STRING                       ConfigRequestHdr;\r
-  EFI_STRING                       ConfigRequest;\r
-  BOOLEAN                          AllocatedRequest;\r
-  EFI_STRING                       FormResult;\r
-  UINTN                            Size;\r
-  UINTN                            BufferSize;\r
-\r
-  if (Progress == NULL || Results == NULL) {\r
+  EFI_STATUS              Status;\r
+  IP4_CONFIG2_INSTANCE    *Ip4Config2Instance;\r
+  IP4_FORM_CALLBACK_INFO  *Private;\r
+  IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData;\r
+  EFI_STRING              ConfigRequestHdr;\r
+  EFI_STRING              ConfigRequest;\r
+  BOOLEAN                 AllocatedRequest;\r
+  EFI_STRING              FormResult;\r
+  UINTN                   Size;\r
+  UINTN                   BufferSize;\r
+\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -891,8 +896,8 @@ Ip4FormExtractConfig (
   Size               = 0;\r
   AllocatedRequest   = FALSE;\r
   ConfigRequest      = Request;\r
-  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
-  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
+  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
+  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK (Private);\r
   BufferSize         = sizeof (IP4_CONFIG2_IFR_NVDATA);\r
   *Progress          = Request;\r
 \r
@@ -914,12 +919,13 @@ Ip4FormExtractConfig (
       // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
       //\r
       ConfigRequestHdr = HiiConstructConfigHdr (&gIp4Config2NvDataGuid, mIp4Config2StorageName, Private->ChildHandle);\r
-      Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-      ConfigRequest = AllocateZeroPool (Size);\r
+      Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+      ConfigRequest    = AllocateZeroPool (Size);\r
       if (ConfigRequest == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Failure;\r
       }\r
+\r
       AllocatedRequest = TRUE;\r
 \r
       UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
@@ -932,7 +938,7 @@ Ip4FormExtractConfig (
     Status = gHiiConfigRouting->BlockToConfig (\r
                                   gHiiConfigRouting,\r
                                   ConfigRequest,\r
-                                  (UINT8 *) IfrFormNvData,\r
+                                  (UINT8 *)IfrFormNvData,\r
                                   BufferSize,\r
                                   &FormResult,\r
                                   Progress\r
@@ -953,7 +959,7 @@ Ip4FormExtractConfig (
     }\r
   }\r
 \r
-  if (Request == NULL || HiiIsConfigHdrMatch (Request, &gIp4Config2NvDataGuid, mIp4Config2StorageName)) {\r
+  if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &gIp4Config2NvDataGuid, mIp4Config2StorageName)) {\r
     *Results = FormResult;\r
   } else {\r
     return EFI_NOT_FOUND;\r
@@ -1008,28 +1014,28 @@ Failure:
 EFI_STATUS\r
 EFIAPI\r
 Ip4FormRouteConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Configuration,\r
-  OUT EFI_STRING                             *Progress\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                            *Progress\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINTN                            BufferSize;\r
-  IP4_CONFIG2_IFR_NVDATA           *IfrFormNvData;\r
-  IP4_CONFIG2_INSTANCE             *Ip4Config2Instance;\r
-  IP4_FORM_CALLBACK_INFO           *Private;\r
+  EFI_STATUS              Status;\r
+  UINTN                   BufferSize;\r
+  IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData;\r
+  IP4_CONFIG2_INSTANCE    *Ip4Config2Instance;\r
+  IP4_FORM_CALLBACK_INFO  *Private;\r
 \r
   Status        = EFI_SUCCESS;\r
   IfrFormNvData = NULL;\r
 \r
-  if (Configuration == NULL || Progress == NULL) {\r
+  if ((Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   *Progress = Configuration;\r
 \r
-  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
-  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
+  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
+  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK (Private);\r
 \r
   //\r
   // Check Routing data in <ConfigHdr>.\r
@@ -1048,7 +1054,7 @@ Ip4FormRouteConfig (
     Status = gHiiConfigRouting->ConfigToBlock (\r
                                   gHiiConfigRouting,\r
                                   Configuration,\r
-                                  (UINT8 *) IfrFormNvData,\r
+                                  (UINT8 *)IfrFormNvData,\r
                                   &BufferSize,\r
                                   Progress\r
                                   );\r
@@ -1059,7 +1065,7 @@ Ip4FormRouteConfig (
     Status = gHiiConfigRouting->ConfigToBlock (\r
                                   gHiiConfigRouting,\r
                                   Configuration,\r
-                                  (UINT8 *) IfrFormNvData,\r
+                                  (UINT8 *)IfrFormNvData,\r
                                   &BufferSize,\r
                                   Progress\r
                                   );\r
@@ -1073,7 +1079,6 @@ Ip4FormRouteConfig (
   }\r
 \r
   return Status;\r
-\r
 }\r
 \r
 /**\r
@@ -1106,35 +1111,35 @@ Ip4FormRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 Ip4FormCallback (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  EFI_BROWSER_ACTION                     Action,\r
-  IN  EFI_QUESTION_ID                        QuestionId,\r
-  IN  UINT8                                  Type,\r
-  IN  EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  EFI_BROWSER_ACTION                    Action,\r
+  IN  EFI_QUESTION_ID                       QuestionId,\r
+  IN  UINT8                                 Type,\r
+  IN  EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP4_CONFIG2_INSTANCE      *Instance;\r
-  IP4_CONFIG2_IFR_NVDATA    *IfrFormNvData;\r
-  IP4_FORM_CALLBACK_INFO    *Private;\r
-\r
-  EFI_IP_ADDRESS            StationAddress;\r
-  EFI_IP_ADDRESS            SubnetMask;\r
-  EFI_IP_ADDRESS            Gateway;\r
-  IP4_ADDR                  Ip;\r
-  EFI_IPv4_ADDRESS          *DnsAddress;\r
-  UINTN                     DnsCount;\r
-  UINTN                     Index;\r
-  EFI_INPUT_KEY             Key;\r
+  EFI_STATUS              Status;\r
+  IP4_CONFIG2_INSTANCE    *Instance;\r
+  IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData;\r
+  IP4_FORM_CALLBACK_INFO  *Private;\r
+\r
+  EFI_IP_ADDRESS    StationAddress;\r
+  EFI_IP_ADDRESS    SubnetMask;\r
+  EFI_IP_ADDRESS    Gateway;\r
+  IP4_ADDR          Ip;\r
+  EFI_IPv4_ADDRESS  *DnsAddress;\r
+  UINTN             DnsCount;\r
+  UINTN             Index;\r
+  EFI_INPUT_KEY     Key;\r
 \r
   IfrFormNvData = NULL;\r
   DnsCount      = 0;\r
   DnsAddress    = NULL;\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
-    Private = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
-    Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
+    Private  = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
+    Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK (Private);\r
 \r
     IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG2_IFR_NVDATA));\r
     if (IfrFormNvData == NULL) {\r
@@ -1144,7 +1149,7 @@ Ip4FormCallback (
     //\r
     // Retrieve uncommitted data from Browser\r
     //\r
-    if (!HiiGetBrowserData (&gIp4Config2NvDataGuid, mIp4Config2StorageName, sizeof (IP4_CONFIG2_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
+    if (!HiiGetBrowserData (&gIp4Config2NvDataGuid, mIp4Config2StorageName, sizeof (IP4_CONFIG2_IFR_NVDATA), (UINT8 *)IfrFormNvData)) {\r
       FreePool (IfrFormNvData);\r
       return EFI_NOT_FOUND;\r
     }\r
@@ -1152,59 +1157,63 @@ Ip4FormCallback (
     Status = EFI_SUCCESS;\r
 \r
     switch (QuestionId) {\r
-    case KEY_LOCAL_IP:\r
-      Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r
-      if (EFI_ERROR (Status) || IP4_IS_UNSPECIFIED (NTOHL (StationAddress.Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (StationAddress.Addr[0]))) {\r
-        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
-        Status = EFI_INVALID_PARAMETER;\r
-      }\r
-      break;\r
+      case KEY_LOCAL_IP:\r
+        Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r
+        if (EFI_ERROR (Status) || IP4_IS_UNSPECIFIED (NTOHL (StationAddress.Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (StationAddress.Addr[0]))) {\r
+          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
+          Status = EFI_INVALID_PARAMETER;\r
+        }\r
 \r
-    case KEY_SUBNET_MASK:\r
-      Status = Ip4Config2StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);\r
-      if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
-        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
-        Status = EFI_INVALID_PARAMETER;\r
-      }\r
-      break;\r
+        break;\r
 \r
-    case KEY_GATE_WAY:\r
-      Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
-      if (EFI_ERROR (Status) || IP4_IS_LOCAL_BROADCAST(NTOHL(Gateway.Addr[0]))) {\r
-        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
-        Status = EFI_INVALID_PARAMETER;\r
-      }\r
-      break;\r
-\r
-    case KEY_DNS:\r
-      Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
-      if (!EFI_ERROR (Status) && DnsCount > 0) {\r
-        for (Index = 0; Index < DnsCount; Index ++) {\r
-          CopyMem (&Ip, &DnsAddress[Index], sizeof (IP4_ADDR));\r
-          if (IP4_IS_UNSPECIFIED (NTOHL (Ip)) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
+      case KEY_SUBNET_MASK:\r
+        Status = Ip4Config2StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);\r
+        if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
+          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
+          Status = EFI_INVALID_PARAMETER;\r
+        }\r
+\r
+        break;\r
+\r
+      case KEY_GATE_WAY:\r
+        Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
+        if (EFI_ERROR (Status) || IP4_IS_LOCAL_BROADCAST (NTOHL (Gateway.Addr[0]))) {\r
+          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
+          Status = EFI_INVALID_PARAMETER;\r
+        }\r
+\r
+        break;\r
+\r
+      case KEY_DNS:\r
+        Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
+        if (!EFI_ERROR (Status) && (DnsCount > 0)) {\r
+          for (Index = 0; Index < DnsCount; Index++) {\r
+            CopyMem (&Ip, &DnsAddress[Index], sizeof (IP4_ADDR));\r
+            if (IP4_IS_UNSPECIFIED (NTOHL (Ip)) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
+              CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
+              Status = EFI_INVALID_PARAMETER;\r
+              break;\r
+            }\r
+          }\r
+        } else {\r
+          if (EFI_ERROR (Status)) {\r
             CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
-            Status = EFI_INVALID_PARAMETER;\r
-            break;\r
           }\r
         }\r
-      } else {\r
-        if (EFI_ERROR (Status)) {\r
-          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
+\r
+        if (DnsAddress != NULL) {\r
+          FreePool (DnsAddress);\r
         }\r
-      }\r
 \r
-      if(DnsAddress != NULL) {\r
-        FreePool(DnsAddress);\r
-      }\r
-      break;\r
+        break;\r
 \r
-    case KEY_SAVE_CHANGES:\r
-      Status = Ip4Config2ConvertIfrNvDataToConfigNvData (IfrFormNvData, Instance);\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
-      break;\r
+      case KEY_SAVE_CHANGES:\r
+        Status         = Ip4Config2ConvertIfrNvDataToConfigNvData (IfrFormNvData, Instance);\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
 \r
     FreePool (IfrFormNvData);\r
@@ -1230,20 +1239,20 @@ Ip4FormCallback (
 **/\r
 EFI_STATUS\r
 Ip4Config2FormInit (\r
-  IN OUT IP4_CONFIG2_INSTANCE     *Instance\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  IP4_SERVICE                    *IpSb;\r
-  IP4_FORM_CALLBACK_INFO         *CallbackInfo;\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL *ConfigAccess;\r
-  VENDOR_DEVICE_PATH             VendorDeviceNode;\r
-  EFI_SERVICE_BINDING_PROTOCOL   *MnpSb;\r
-  CHAR16                         *MacString;\r
-  CHAR16                         MenuString[128];\r
-  CHAR16                         PortString[128];\r
-  CHAR16                         *OldMenuString;\r
-  EFI_DEVICE_PATH_PROTOCOL       *ParentDevicePath;\r
+  EFI_STATUS                      Status;\r
+  IP4_SERVICE                     *IpSb;\r
+  IP4_FORM_CALLBACK_INFO          *CallbackInfo;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
+  VENDOR_DEVICE_PATH              VendorDeviceNode;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *MnpSb;\r
+  CHAR16                          *MacString;\r
+  CHAR16                          MenuString[128];\r
+  CHAR16                          PortString[128];\r
+  CHAR16                          *OldMenuString;\r
+  EFI_DEVICE_PATH_PROTOCOL        *ParentDevicePath;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r
@@ -1255,7 +1264,7 @@ Ip4Config2FormInit (
   Status = gBS->HandleProtocol (\r
                   IpSb->Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath\r
+                  (VOID **)&ParentDevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1275,7 +1284,7 @@ Ip4Config2FormInit (
   SetDevicePathNodeLength (&VendorDeviceNode.Header, sizeof (VENDOR_DEVICE_PATH));\r
   CallbackInfo->HiiVendorDevicePath = AppendDevicePathNode (\r
                                         ParentDevicePath,\r
-                                        (EFI_DEVICE_PATH_PROTOCOL *) &VendorDeviceNode\r
+                                        (EFI_DEVICE_PATH_PROTOCOL *)&VendorDeviceNode\r
                                         );\r
   if (CallbackInfo->HiiVendorDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -1306,7 +1315,7 @@ Ip4Config2FormInit (
     Status = gBS->OpenProtocol (\r
                     IpSb->Controller,\r
                     &gEfiManagedNetworkServiceBindingProtocolGuid,\r
-                    (VOID **) &MnpSb,\r
+                    (VOID **)&MnpSb,\r
                     IpSb->Image,\r
                     CallbackInfo->ChildHandle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1377,12 +1386,12 @@ Error:
 **/\r
 VOID\r
 Ip4Config2FormUnload (\r
-  IN OUT IP4_CONFIG2_INSTANCE     *Instance\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  IP4_SERVICE                    *IpSb;\r
-  IP4_FORM_CALLBACK_INFO         *CallbackInfo;\r
-  IP4_CONFIG2_NVDATA             *Ip4NvData;\r
+  IP4_SERVICE             *IpSb;\r
+  IP4_FORM_CALLBACK_INFO  *CallbackInfo;\r
+  IP4_CONFIG2_NVDATA      *Ip4NvData;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r
@@ -1426,16 +1435,16 @@ Ip4Config2FormUnload (
 \r
   Ip4NvData = &Instance->Ip4NvData;\r
 \r
-  if(Ip4NvData->ManualAddress != NULL) {\r
-    FreePool(Ip4NvData->ManualAddress);\r
+  if (Ip4NvData->ManualAddress != NULL) {\r
+    FreePool (Ip4NvData->ManualAddress);\r
   }\r
 \r
-  if(Ip4NvData->GatewayAddress != NULL) {\r
-    FreePool(Ip4NvData->GatewayAddress);\r
+  if (Ip4NvData->GatewayAddress != NULL) {\r
+    FreePool (Ip4NvData->GatewayAddress);\r
   }\r
 \r
-  if(Ip4NvData->DnsAddress != NULL) {\r
-    FreePool(Ip4NvData->DnsAddress);\r
+  if (Ip4NvData->DnsAddress != NULL) {\r
+    FreePool (Ip4NvData->DnsAddress);\r
   }\r
 \r
   Ip4NvData->ManualAddressCount  = 0;\r