Update the code to following EDK coding style document.

[mirror_edk2.git] / MdeModulePkg / Universal / BdsDxe / BootMaint / Variable.c

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index 498a40f722a0e29cf85bd9282e5229a59ec4e38e..6479cd0f17d18c3276f76d997d4ba356b422dee6 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -121,7 +121,7 @@ Var_ChangeBootOrder (
   //\r
   // If exists, delete it to hold new BootOrder\r
   //\r
-  if (BootOrderList) {\r
+  if (BootOrderList != NULL) {\r
     EfiLibDeleteVariable (L"BootOrder", &gEfiGlobalVariableGuid);\r
     SafeFreePool (BootOrderList);\r
     BootOrderList = NULL;\r
@@ -271,7 +271,7 @@ Var_ChangeDriverOrder (
   //\r
   // If exists, delete it to hold new DriverOrder\r
   //\r
-  if (DriverOrderList) {\r
+  if (DriverOrderList != NULL) {\r
     EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
     SafeFreePool (DriverOrderList);\r
     DriverOrderList = NULL;\r
@@ -315,7 +315,7 @@ Var_ChangeDriverOrder (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param VOID            EDES_TODO: Add parameter description\r
 \r
@@ -335,7 +335,7 @@ Var_UpdateAllConsoleOption (
   OutDevicePath = EfiLibGetVariable (L"ConOut", &gEfiGlobalVariableGuid);\r
   InpDevicePath = EfiLibGetVariable (L"ConIn", &gEfiGlobalVariableGuid);\r
   ErrDevicePath = EfiLibGetVariable (L"ErrOut", &gEfiGlobalVariableGuid);\r
-  if (OutDevicePath) {\r
+  if (OutDevicePath != NULL) {\r
     ChangeVariableDevicePath (OutDevicePath);\r
     Status = gRT->SetVariable (\r
                     L"ConOut",\r
@@ -347,7 +347,7 @@ Var_UpdateAllConsoleOption (
     ASSERT (!EFI_ERROR (Status));\r
   }\r
 \r
-  if (InpDevicePath) {\r
+  if (InpDevicePath != NULL) {\r
     ChangeVariableDevicePath (InpDevicePath);\r
     Status = gRT->SetVariable (\r
                     L"ConIn",\r
@@ -359,7 +359,7 @@ Var_UpdateAllConsoleOption (
     ASSERT (!EFI_ERROR (Status));\r
   }\r
 \r
-  if (ErrDevicePath) {\r
+  if (ErrDevicePath != NULL) {\r
     ChangeVariableDevicePath (ErrDevicePath);\r
     Status = gRT->SetVariable (\r
                     L"ErrOut",\r
@@ -373,7 +373,7 @@ Var_UpdateAllConsoleOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param ConsoleName     EDES_TODO: Add parameter description\r
   @param ConsoleMenu     EDES_TODO: Add parameter description\r
@@ -430,9 +430,9 @@ Var_UpdateConsoleOption (
     }\r
 \r
     NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
-    if ((NewTerminalContext->IsConIn && (UpdatePageId == FORM_CON_IN_ID)) ||\r
-        (NewTerminalContext->IsConOut && (UpdatePageId == FORM_CON_OUT_ID)) ||\r
-        (NewTerminalContext->IsStdErr && (UpdatePageId == FORM_CON_ERR_ID))\r
+    if (((NewTerminalContext->IsConIn != 0) && (UpdatePageId == FORM_CON_IN_ID)) ||\r
+        ((NewTerminalContext->IsConOut != 0)  && (UpdatePageId == FORM_CON_OUT_ID)) ||\r
+        ((NewTerminalContext->IsStdErr  != 0) && (UpdatePageId == FORM_CON_ERR_ID))\r
         ) {\r
       Vendor.Header.Type    = MESSAGING_DEVICE_PATH;\r
       Vendor.Header.SubType = MSG_VENDOR_DP;\r
@@ -455,7 +455,7 @@ Var_UpdateConsoleOption (
     }\r
   }\r
 \r
-  if (ConDevicePath) {\r
+  if (ConDevicePath != NULL) {\r
     Status = gRT->SetVariable (\r
                     ConsoleName,\r
                     &gEfiGlobalVariableGuid,\r
@@ -473,7 +473,7 @@ Var_UpdateConsoleOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param VOID            EDES_TODO: Add parameter description\r
 \r
@@ -489,7 +489,7 @@ Var_UpdateConsoleInpOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param VOID            EDES_TODO: Add parameter description\r
 \r
@@ -505,7 +505,7 @@ Var_UpdateConsoleOutOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param VOID            EDES_TODO: Add parameter description\r
 \r
@@ -521,7 +521,7 @@ Var_UpdateErrorOutOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param CallbackData    EDES_TODO: Add parameter description\r
   @param HiiHandle       EDES_TODO: Add parameter description\r
@@ -698,7 +698,7 @@ Var_UpdateDriverOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param CallbackData    EDES_TODO: Add parameter description\r
   @param NvRamMap        EDES_TODO: Add parameter description\r
@@ -865,7 +865,7 @@ Var_UpdateBootOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param CallbackData    EDES_TODO: Add parameter description\r
 \r
@@ -922,7 +922,7 @@ Var_UpdateBootNext (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param CallbackData    EDES_TODO: Add parameter description\r
 \r
@@ -954,18 +954,18 @@ Var_UpdateBootOrder (
                     );\r
 \r
   NewBootOrderList = EfiAllocateZeroPool (BootOrderListSize);\r
-  if (!NewBootOrderList) {\r
+  if (NewBootOrderList == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   Map = EfiAllocateZeroPool (BootOrderListSize / sizeof (UINT16));\r
-  if (!Map) {\r
+  if (Map == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   //\r
   // If exists, delete it to hold new BootOrder\r
   //\r
-  if (BootOrderList) {\r
+  if (BootOrderList != NULL) {\r
     EfiLibDeleteVariable (L"BootOrder", &gEfiGlobalVariableGuid);\r
   }\r
 \r
@@ -995,7 +995,7 @@ Var_UpdateBootOrder (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param CallbackData    EDES_TODO: Add parameter description\r
 \r
@@ -1027,13 +1027,13 @@ Var_UpdateDriverOrder (
 \r
   NewDriverOrderList = EfiAllocateZeroPool (DriverOrderListSize);\r
 \r
-  if (!NewDriverOrderList) {\r
+  if (NewDriverOrderList == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   //\r
   // If exists, delete it to hold new DriverOrder\r
   //\r
-  if (DriverOrderList) {\r
+  if (DriverOrderList != NULL) {\r
     EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
   }\r
 \r
@@ -1060,7 +1060,7 @@ Var_UpdateDriverOrder (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param CallbackData    EDES_TODO: Add parameter description\r
 \r
@@ -1202,7 +1202,7 @@ Var_UpdateBBSOption (
     Tmp &= 0xFF;\r
     Pos = Tmp / 8;\r
     Bit = 7 - (Tmp % 8);\r
-    if (DisMap[Pos] & (1 << Bit)) {\r
+    if ((DisMap[Pos] & (1 << Bit)) != 0) {\r
       NewOrder[Index] = (UINT16) (0xFF00 | Tmp);\r
       Index++;\r
     }\r
@@ -1364,7 +1364,7 @@ Var_UpdateBBSOption (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description\r
+  EDES_TODO: Add function description.\r
 \r
   @param CallbackData    EDES_TODO: Add parameter description\r
 \r