GenericBdsLib: Remove a un-reasonable ASSERT when BdsLibVariableToOption() returns...

[mirror_edk2.git] / IntelFrameworkModulePkg / Library / GenericBdsLib / BdsMisc.c

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
index f46efd86363161412cb25be237174dfd818dd4bc..66b9d2bb2d9574a7d42e7b22b48bf13e836b9694 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Misc BDS library function\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. <BR>\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -572,9 +572,9 @@ BdsLibBuildOptionFromVar (
     }\r
 \r
     Option              = BdsLibVariableToOption (BdsCommonOptionList, OptionName);\r
-    ASSERT (Option != NULL);\r
-    Option->BootCurrent = OptionOrder[Index];\r
-\r
+    if (Option != NULL) {\r
+      Option->BootCurrent = OptionOrder[Index];\r
+    }\r
   }\r
 \r
   FreePool (OptionOrder);\r
@@ -795,7 +795,7 @@ BdsLibOutputStrings (
     // If String is NULL, then it's the end of the list\r
     //\r
     String = VA_ARG (Args, CHAR16 *);\r
-    if (String != NULL) {\r
+    if (String == NULL) {\r
       break;\r
     }\r
 \r
@@ -811,7 +811,7 @@ BdsLibOutputStrings (
 }\r
 \r
 //\r
-//  Following are BDS Lib functions which  contain all the code about setup browser reset reminder feature.\r
+//  Following are BDS Lib functions which contain all the code about setup browser reset reminder feature.\r
 //  Setup Browser reset reminder feature is that an reset reminder will be given before user leaves the setup browser  if\r
 //  user change any option setting which needs a reset to be effective, and  the reset will be applied according to  the user selection.\r
 //\r
@@ -938,7 +938,7 @@ SetupResetReminder (
       // Popup a menu to notice user\r
       //\r
       do {\r
-        IfrLibCreatePopUp (2, &Key, StringBuffer1, StringBuffer2);\r
+        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, StringBuffer1, StringBuffer2, NULL);\r
       } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
       FreePool (StringBuffer1);\r
@@ -1006,11 +1006,12 @@ BdsLibGetImageHeader (
     Root = NULL;\r
     goto Done;\r
   }\r
-\r
+  ASSERT (Root != NULL);\r
   Status = Root->Open (Root, &ThisFile, FileName, EFI_FILE_MODE_READ, 0);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
+  ASSERT (ThisFile != NULL);\r
 \r
   //\r
   // Get file size\r