NetworkPkg: Apply uncrustify changes

[mirror_edk2.git] / NetworkPkg / Application / VConfig / VConfig.c

diff --git a/NetworkPkg/Application/VConfig/VConfig.c b/NetworkPkg/Application/VConfig/VConfig.c
index b50b07b972be07739995215d4f2ed37244b797ff..2c323e377becc59db45e095abc02a1876e2bdf9d 100644 (file)
--- a/NetworkPkg/Application/VConfig/VConfig.c
+++ b/NetworkPkg/Application/VConfig/VConfig.c
@@ -23,20 +23,20 @@
 //\r
 // String token ID of VConfig command help message text.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mStringVConfigHelpTokenId = STRING_TOKEN (STR_VCONFIG_HELP);\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID  mStringVConfigHelpTokenId = STRING_TOKEN (STR_VCONFIG_HELP);\r
 \r
-#define INVALID_NIC_INDEX   0xffff\r
-#define INVALID_VLAN_ID     0xffff\r
+#define INVALID_NIC_INDEX  0xffff\r
+#define INVALID_VLAN_ID    0xffff\r
 \r
 //\r
 // This is the generated String package data for all .UNI files.\r
 // This data array is ready to be used as input of HiiAddPackages() to\r
 // create a packagelist (which contains Form packages, String packages, etc).\r
 //\r
-extern UINT8      VConfigStrings[];\r
+extern UINT8  VConfigStrings[];\r
 \r
-EFI_HANDLE        mImageHandle  = NULL;\r
-EFI_HII_HANDLE    mHiiHandle    = NULL;\r
+EFI_HANDLE      mImageHandle = NULL;\r
+EFI_HII_HANDLE  mHiiHandle   = NULL;\r
 \r
 SHELL_PARAM_ITEM  mParamList[] = {\r
   {\r
@@ -66,14 +66,14 @@ SHELL_PARAM_ITEM  mParamList[] = {
 **/\r
 VOID\r
 LocateNicHandleBuffer (\r
-  OUT UINTN                       *NumberOfHandles,\r
-  OUT EFI_HANDLE                  **HandleBuffer\r
+  OUT UINTN       *NumberOfHandles,\r
+  OUT EFI_HANDLE  **HandleBuffer\r
   )\r
 {\r
   EFI_STATUS  Status;\r
 \r
-  *NumberOfHandles  = 0;\r
-  *HandleBuffer     = NULL;\r
+  *NumberOfHandles = 0;\r
+  *HandleBuffer    = NULL;\r
 \r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
@@ -98,7 +98,7 @@ LocateNicHandleBuffer (
 **/\r
 UINTN\r
 NicNameToIndex (\r
-  IN CHAR16                   *Name\r
+  IN CHAR16  *Name\r
   )\r
 {\r
   CHAR16  *Str;\r
@@ -116,7 +116,7 @@ NicNameToIndex (
     Str++;\r
   }\r
 \r
-  return (UINT16) StrDecimalToUintn (Name + 3);\r
+  return (UINT16)StrDecimalToUintn (Name + 3);\r
 }\r
 \r
 /**\r
@@ -130,7 +130,7 @@ NicNameToIndex (
 **/\r
 EFI_HANDLE\r
 NicNameToHandle (\r
-  IN CHAR16                   *Name\r
+  IN CHAR16  *Name\r
   )\r
 {\r
   UINTN       NumberOfHandles;\r
@@ -168,7 +168,7 @@ NicNameToHandle (
 **/\r
 EFI_VLAN_CONFIG_PROTOCOL *\r
 OpenVlanConfigProtocol (\r
-  IN EFI_HANDLE                 Handle\r
+  IN EFI_HANDLE  Handle\r
   )\r
 {\r
   EFI_VLAN_CONFIG_PROTOCOL  *VlanConfig;\r
@@ -177,7 +177,7 @@ OpenVlanConfigProtocol (
   gBS->OpenProtocol (\r
          Handle,\r
          &gEfiVlanConfigProtocolGuid,\r
-         (VOID **) &VlanConfig,\r
+         (VOID **)&VlanConfig,\r
          mImageHandle,\r
          Handle,\r
          EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -194,7 +194,7 @@ OpenVlanConfigProtocol (
 **/\r
 VOID\r
 CloseVlanConfigProtocol (\r
-  IN EFI_HANDLE                 Handle\r
+  IN EFI_HANDLE  Handle\r
   )\r
 {\r
   gBS->CloseProtocol (\r
@@ -214,8 +214,8 @@ CloseVlanConfigProtocol (
 **/\r
 VOID\r
 ShowNicVlanInfo (\r
-  IN EFI_HANDLE              Handle,\r
-  IN UINTN                   NicIndex\r
+  IN EFI_HANDLE  Handle,\r
+  IN UINTN       NicIndex\r
   )\r
 {\r
   CHAR16                    *MacStr;\r
@@ -227,11 +227,11 @@ ShowNicVlanInfo (
 \r
   VlanConfig = OpenVlanConfigProtocol (Handle);\r
   if (VlanConfig == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  MacStr  = NULL;\r
-  Status  = NetLibGetMacString (Handle, mImageHandle, &MacStr);\r
+  MacStr = NULL;\r
+  Status = NetLibGetMacString (Handle, mImageHandle, &MacStr);\r
   if (EFI_ERROR (Status)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_MAC_FAIL), mHiiHandle, Status);\r
     goto Exit;\r
@@ -281,7 +281,7 @@ Exit:
 **/\r
 VOID\r
 DisplayVlan (\r
-  IN CHAR16              *Name OPTIONAL\r
+  IN CHAR16  *Name OPTIONAL\r
   )\r
 {\r
   UINTN       NumberOfHandles;\r
@@ -295,11 +295,11 @@ DisplayVlan (
     //\r
     NicHandle = NicNameToHandle (Name);\r
     if (NicHandle == NULL) {\r
-      return ;\r
+      return;\r
     }\r
 \r
     ShowNicVlanInfo (NicHandle, 0);\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -307,7 +307,7 @@ DisplayVlan (
   //\r
   LocateNicHandleBuffer (&NumberOfHandles, &HandleBuffer);\r
   if (NumberOfHandles == 0) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   for (Index = 0; Index < NumberOfHandles; Index++) {\r
@@ -327,7 +327,7 @@ DisplayVlan (
 **/\r
 UINT16\r
 StrToVlanId (\r
-  IN CHAR16             *String\r
+  IN CHAR16  *String\r
   )\r
 {\r
   CHAR16  *Str;\r
@@ -345,7 +345,7 @@ StrToVlanId (
     return INVALID_VLAN_ID;\r
   }\r
 \r
-  return (UINT16) StrDecimalToUintn (String);\r
+  return (UINT16)StrDecimalToUintn (String);\r
 }\r
 \r
 /**\r
@@ -356,7 +356,7 @@ StrToVlanId (
 **/\r
 VOID\r
 AddVlan (\r
-  IN CHAR16             *ParamStr\r
+  IN CHAR16  *ParamStr\r
   )\r
 {\r
   CHAR16                    *Name;\r
@@ -371,17 +371,17 @@ AddVlan (
   EFI_VLAN_CONFIG_PROTOCOL  *VlanConfig;\r
   EFI_STATUS                Status;\r
 \r
-  VlanConfig  = NULL;\r
-  Priority    = 0;\r
+  VlanConfig = NULL;\r
+  Priority   = 0;\r
 \r
   if (ParamStr == NULL) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle);\r
-    return ;\r
+    return;\r
   }\r
 \r
   StrPtr = AllocateCopyPool (StrSize (ParamStr), ParamStr);\r
   if (StrPtr == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Name        = StrPtr;\r
@@ -459,7 +459,7 @@ AddVlan (
   //\r
   // Set VLAN\r
   //\r
-  Status = VlanConfig->Set (VlanConfig, (UINT16) VlanId, (UINT8) Priority);\r
+  Status = VlanConfig->Set (VlanConfig, (UINT16)VlanId, (UINT8)Priority);\r
   if (EFI_ERROR (Status)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_SET_FAIL), mHiiHandle, Status);\r
     goto Exit;\r
@@ -468,7 +468,7 @@ AddVlan (
   //\r
   // Connect the VLAN device.\r
   //\r
-  VlanHandle = NetLibGetVlanHandle (Handle, (UINT16) VlanId);\r
+  VlanHandle = NetLibGetVlanHandle (Handle, (UINT16)VlanId);\r
   if (VlanHandle != NULL) {\r
     gBS->ConnectController (VlanHandle, NULL, NULL, TRUE);\r
   }\r
@@ -491,7 +491,7 @@ Exit:
 **/\r
 VOID\r
 DeleteVlan (\r
-  IN CHAR16 *ParamStr\r
+  IN CHAR16  *ParamStr\r
   )\r
 {\r
   CHAR16                    *Name;\r
@@ -508,12 +508,12 @@ DeleteVlan (
 \r
   if (ParamStr == NULL) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle);\r
-    return ;\r
+    return;\r
   }\r
 \r
   StrPtr = AllocateCopyPool (StrSize (ParamStr), ParamStr);\r
   if (StrPtr == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Name      = StrPtr;\r
@@ -541,7 +541,7 @@ DeleteVlan (
   //\r
   // Check VLAN ID\r
   //\r
-  if (VlanIdStr == NULL || *VlanIdStr == 0) {\r
+  if ((VlanIdStr == NULL) || (*VlanIdStr == 0)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_VID), mHiiHandle);\r
     goto Exit;\r
   }\r
@@ -555,7 +555,7 @@ DeleteVlan (
   //\r
   // Delete VLAN.\r
   //\r
-  Status = VlanConfig->Remove (VlanConfig, (UINT16) VlanId);\r
+  Status = VlanConfig->Remove (VlanConfig, (UINT16)VlanId);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_NOT_FOUND) {\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NOT_FOUND), mHiiHandle);\r
@@ -606,10 +606,10 @@ VlanConfigMain (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  LIST_ENTRY    *List;\r
-  CONST CHAR16  *Str;\r
-  EFI_HII_PACKAGE_LIST_HEADER     *PackageList;\r
-  EFI_STATUS    Status;\r
+  LIST_ENTRY                   *List;\r
+  CONST CHAR16                 *Str;\r
+  EFI_HII_PACKAGE_LIST_HEADER  *PackageList;\r
+  EFI_STATUS                   Status;\r
 \r
   mImageHandle = ImageHandle;\r
 \r
@@ -619,7 +619,7 @@ VlanConfigMain (
   Status = gBS->OpenProtocol (\r
                   ImageHandle,\r
                   &gEfiHiiPackageListProtocolGuid,\r
-                  (VOID **) &PackageList,\r
+                  (VOID **)&PackageList,\r
                   ImageHandle,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -632,11 +632,11 @@ VlanConfigMain (
   // Publish HII package list to HII Database.\r
   //\r
   Status = gHiiDatabase->NewPackageList (\r
-                          gHiiDatabase,\r
-                          PackageList,\r
-                          NULL,\r
-                          &mHiiHandle\r
-                          );\r
+                           gHiiDatabase,\r
+                           PackageList,\r
+                           NULL,\r
+                           &mHiiHandle\r
+                           );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -654,19 +654,19 @@ VlanConfigMain (
 \r
   if (ShellCommandLineGetFlag (List, L"-l")) {\r
     Str = ShellCommandLineGetValue (List, L"-l");\r
-    DisplayVlan ((CHAR16 *) Str);\r
+    DisplayVlan ((CHAR16 *)Str);\r
     goto Exit;\r
   }\r
 \r
   if (ShellCommandLineGetFlag (List, L"-a")) {\r
     Str = ShellCommandLineGetValue (List, L"-a");\r
-    AddVlan ((CHAR16 *) Str);\r
+    AddVlan ((CHAR16 *)Str);\r
     goto Exit;\r
   }\r
 \r
   if (ShellCommandLineGetFlag (List, L"-d")) {\r
     Str = ShellCommandLineGetValue (List, L"-d");\r
-    DeleteVlan ((CHAR16 *) Str);\r
+    DeleteVlan ((CHAR16 *)Str);\r
     goto Exit;\r
   }\r
 \r