diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2016-01-21 18:40:26 +0000 |
|---|---|---|
| committer | lersek <lersek@Edk2> | 2016-01-21 18:40:26 +0000 |
| commit | 5a5a659092ebc3936ecd18c3b78c6fc850d4af1c (patch) | |
| tree | 613791c6cbfc9710ce1f97ef7ff922e01784afc3 | |
| parent | 40de6483ec902472dabf61332595194937f5c260 (diff) | |
| download | edk2-platforms-5a5a659092ebc3936ecd18c3b78c6fc850d4af1c.tar.xz | |
ShellPkg: BcfgDisplayDump(): calculate OptionalDataOffset explicitly
Eliminate some more repeated pointer arithmetic.
This patch too is only refactoring.
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@19714 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c index d109ca29a7..ca7ecd1751 100644 --- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c +++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c @@ -1055,6 +1055,7 @@ BcfgDisplayDump( EFI_LOAD_OPTION *LoadOption;
CHAR16 *Description;
UINTN DescriptionSize;
+ UINTN OptionalDataOffset;
if (OrderCount == 0) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_BCFG_NONE), gShellBcfgHiiHandle, L"bcfg");
@@ -1118,6 +1119,10 @@ BcfgDisplayDump( FilePathList = (UINT8 *)Description + DescriptionSize;
DevPathString = ConvertDevicePathToText(FilePathList, TRUE, FALSE);
}
+
+ OptionalDataOffset = sizeof *LoadOption + DescriptionSize +
+ LoadOption->FilePathListLength;
+
ShellPrintHiiEx(
-1,
-1,
@@ -1128,9 +1133,10 @@ BcfgDisplayDump( VariableName,
Description,
DevPathString,
- (DescriptionSize + LoadOption->FilePathListLength + 6) <= BufferSize?L'N':L'Y');
+ OptionalDataOffset <= BufferSize ? L'N' : L'Y'
+ );
if (VerboseOutput) {
- for (LoopVar2 = (DescriptionSize + LoadOption->FilePathListLength + 6);LoopVar2<BufferSize;LoopVar2++){
+ for (LoopVar2 = OptionalDataOffset; LoopVar2 < BufferSize; LoopVar2++){
ShellPrintEx(
-1,
-1,
|