tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: BcfgDisplayDump(): call Description[Size] by name 

Introduce two more helper variables to avoid repeated pointer arithmetic.

This patch is not supposed to change behavior.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ryan Harkin <ryan.harkin@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19712 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Laszlo Ersek 2016-01-21 18:40:17 +00:00 committed by lersek
parent 3b6b1105cf
commit 5dc03ade6a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
View File

@ -1053,6 +1053,8 @@ BcfgDisplayDump(
VOID *DevPath;
UINTN Errors;
EFI_LOAD_OPTION *LoadOption;
CHAR16 *Description;
UINTN DescriptionSize;
if (OrderCount == 0) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_BCFG_NONE), gShellBcfgHiiHandle, L"bcfg");
@ -1108,12 +1110,15 @@ BcfgDisplayDump(
++Errors;
goto Cleanup;
}
LoadOption = (EFI_LOAD_OPTION *)Buffer;
LoadOption = (EFI_LOAD_OPTION *)Buffer;
Description = (CHAR16 *)(&LoadOption->FilePathListLength + 1);
DescriptionSize = StrSize (Description);
if (LoadOption->FilePathListLength != 0) {
DevPath = AllocateZeroPool(LoadOption->FilePathListLength);
if (DevPath != NULL) {
CopyMem(DevPath, Buffer+6+StrSize((CHAR16*)(Buffer+6)), LoadOption->FilePathListLength);
CopyMem(DevPath, Buffer+6+DescriptionSize, LoadOption->FilePathListLength);
DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);
}
}
@ -1125,11 +1130,11 @@ BcfgDisplayDump(
gShellBcfgHiiHandle,
LoopVar,
VariableName,
(CHAR16*)(Buffer+6),
Description,
DevPathString,
(StrSize((CHAR16*)(Buffer+6)) + LoadOption->FilePathListLength + 6) <= BufferSize?L'N':L'Y');
(DescriptionSize + LoadOption->FilePathListLength + 6) <= BufferSize?L'N':L'Y');
if (VerboseOutput) {
for (LoopVar2 = (StrSize((CHAR16*)(Buffer+6)) + LoadOption->FilePathListLength + 6);LoopVar2<BufferSize;LoopVar2++){
for (LoopVar2 = (DescriptionSize + LoadOption->FilePathListLength + 6);LoopVar2<BufferSize;LoopVar2++){
ShellPrintEx(
-1,
-1,