Updates the logic to allow DmpStore to specify a name independent of specifying a...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15757 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index 00fe3ad923f7a081848af34f14707233e6a830b0..0eee944ed4296f97b808f7a5c9571b3dd5ea6589 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -641,6 +641,9 @@ ShellCommandRunDmpStore (
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDebug1HiiHandle, L"-l or -s", L"-d");\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
+      //\r
+      // Determine the GUID to search for based on -all and -guid parameters\r
+      //\r
       if (!ShellCommandLineGetFlag(Package, L"-all")) {\r
         GuidStr = ShellCommandLineGetValue(Package, L"-guid");\r
         if (GuidStr != NULL) {\r
@@ -653,11 +656,15 @@ ShellCommandRunDmpStore (
         } else  {\r
           Guid = &gEfiGlobalVariableGuid;\r
         }\r
-        Name = ShellCommandLineGetRawValue(Package, 1);\r
       } else {\r
-        Name  = NULL;\r
         Guid  = NULL;\r
       }\r
+\r
+      //\r
+      // Get the Name of the variable to find\r
+      //\r
+      Name = ShellCommandLineGetRawValue(Package, 1);\r
+\r
       if (ShellStatus == SHELL_SUCCESS) {\r
         if (ShellCommandLineGetFlag(Package, L"-s")) {\r
           Type = DmpStoreSave;\r