When ASSERT_EFI_ERROR() is compiled out, dependent on build flags, only
the status checking should be removed; the function calls should stay.
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Shumin Qiu <shumin.qiu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
SCRIPT_FILE *CurrentScriptFile;\r
SCRIPT_FILE *CurrentScriptFile;\r
- ASSERT_EFI_ERROR(CommandInit());\r
+\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
if (gEfiShellParametersProtocol->Argc > 1) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if"); \r
\r
if (gEfiShellParametersProtocol->Argc > 1) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if"); \r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
SCRIPT_FILE *CurrentScriptFile;\r
SCRIPT_FILE *CurrentScriptFile;\r
- ASSERT_EFI_ERROR(CommandInit());\r
+\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
if (gEfiShellParametersProtocol->Argc > 1) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if"); \r
\r
if (gEfiShellParametersProtocol->Argc > 1) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if"); \r
ShellInitialize (\r
)\r
{\r
ShellInitialize (\r
)\r
{\r
+ EFI_STATUS Status;\r
+\r
//\r
// if auto initialize is not false then skip\r
//\r
//\r
// if auto initialize is not false then skip\r
//\r
//\r
// deinit the current stuff\r
//\r
//\r
// deinit the current stuff\r
//\r
- ASSERT_EFI_ERROR(ShellLibDestructor(gImageHandle, gST));\r
+ Status = ShellLibDestructor (gImageHandle, gST);\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// init the new stuff\r
\r
//\r
// init the new stuff\r