diff options
| author | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-02-24 17:12:39 +0000 |
|---|---|---|
| committer | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-02-24 17:12:39 +0000 |
| commit | 287b4d32eee06417557ca2229c4ed75701aa651e (patch) | |
| tree | 875a93c587d12f0e83b0e03a6a32fdb2fc109807 /ShellPkg/Library | |
| parent | c0a1f7776b8429d167cf1740ea3dbc4964dca338 (diff) | |
| download | edk2-platforms-287b4d32eee06417557ca2229c4ed75701aa651e.tar.xz | |
ShellPkg: Fix ICC11 build failure.
Signed-off-by: jcarsey
Reviewed-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13032 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ShellPkg/Library')
| -rw-r--r-- | ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c index 921ebe5485..e800533b6f 100644 --- a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c +++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c @@ -934,33 +934,37 @@ BcfgAddOptInstall1( //
// Open the file and populate the data buffer.
//
- ShellStatus = ShellOpenFileByName(
+ Status = ShellOpenFileByName(
FileName,
&FileHandle,
EFI_FILE_MODE_READ,
0);
- if (ShellStatus == SHELL_SUCCESS) {
- ShellStatus = ShellGetFileSize(FileHandle, &Intermediate);
+ if (!EFI_ERROR(Status)) {
+ Status = ShellGetFileSize(FileHandle, &Intermediate);
}
Data = AllocateZeroPool((UINTN)Intermediate);
if (Data == NULL) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellInstall1HiiHandle);
ShellStatus = SHELL_OUT_OF_RESOURCES;
}
- if (ShellStatus == SHELL_SUCCESS) {
- ShellStatus = ShellReadFile(FileHandle, (UINTN *)&Intermediate, Data);
+ if (!EFI_ERROR(Status)) {
+ Status = ShellReadFile(FileHandle, (UINTN *)&Intermediate, Data);
}
} else {
Intermediate = StrSize(Data);
}
- if (ShellStatus == SHELL_SUCCESS && Data != NULL) {
+ if (!EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS && Data != NULL) {
Status = UpdateOptionalData(CurrentOrder[OptionIndex], (UINTN)Intermediate, (UINT8*)Data, Target);
if (EFI_ERROR(Status)) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellInstall1HiiHandle, VariableName, Status);
ShellStatus = SHELL_INVALID_PARAMETER;
}
}
+ if (EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS) {
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_SET_VAR_FAIL), gShellInstall1HiiHandle, VariableName, Status);
+ ShellStatus = SHELL_INVALID_PARAMETER;
+ }
}
SHELL_FREE_NON_NULL(Data);
|