Keep consistent about the return value between the caller and callee.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15021 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
index 31e1091e8889e9c31fd89be54352f280aa2e69c2..bb4b2f4e8d40a162000767f6c6e0b712794f0bd2 100644 (file)
--- a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
+++ b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
@@ -116,7 +116,7 @@ CreateDialog (
 /**\r
   Confirm how to handle the changed data. \r
   \r
-  @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.\r
+  @return Action BROWSER_SAVE_CHANGES, BROWSER_DISCARD_CHANGES or other values.\r
 **/\r
 UINTN\r
 EFIAPI\r

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
index 92f3a43a7784d460b2cee1de1d64b24b28a0edd8..5b5f37d175052a724441a762c6aa41708c44db16 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
@@ -543,7 +543,7 @@ CreateDialog (
 /**\r
   Confirm how to handle the changed data. \r
   \r
-  @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.\r
+  @return Action BROWSER_SAVE_CHANGES, BROWSER_DISCARD_CHANGES or other values.\r
 **/\r
 UINTN\r
 EFIAPI\r
@@ -573,11 +573,11 @@ ConfirmDataChange (
   );\r
   \r
   if (Key.ScanCode == SCAN_ESC) {\r
-    return BROWSER_ACTION_NONE;\r
+    return BROWSER_NO_CHANGES;\r
   } else if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (YesResponse | UPPER_LOWER_CASE_OFFSET)) {\r
-    return BROWSER_ACTION_SUBMIT;\r
+    return BROWSER_SAVE_CHANGES;\r
   } else {\r
-    return BROWSER_ACTION_DISCARD;\r
+    return BROWSER_DISCARD_CHANGES;\r
   }\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index f8b1d5067eb50bab79d7ca100bde88bf49886091..788a63f4e42205c90ca782667a3058aa1c879a0f 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1263,15 +1263,15 @@ ProcessChangedData (
 \r
   RetValue = TRUE;\r
   switch (mFormDisplay->ConfirmDataChange()) {\r
-    case BROWSER_ACTION_DISCARD:\r
+    case BROWSER_DISCARD_CHANGES:\r
       DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
       break;\r
   \r
-    case BROWSER_ACTION_SUBMIT:\r
+    case BROWSER_SAVE_CHANGES:\r
       SubmitForm (Selection->FormSet, Selection->Form, Scope);\r
       break;\r
 \r
-    case BROWSER_ACTION_NONE:\r
+    case BROWSER_NO_CHANGES:\r
       RetValue = FALSE;\r
       break;\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index c7c7f9ae43eb780aede99081c6d567d51693f717..3671c0ed1caa1e066f589fb1795fb170fb94b14c 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -5062,6 +5062,8 @@ SaveReminder (
     } else if (DataSavedAction == BROWSER_DISCARD_CHANGES) {\r
       DiscardForm (NULL, NULL, SystemLevel);\r
       break;\r
+    } else if (DataSavedAction == BROWSER_NO_CHANGES) {\r
+      break;\r
     }\r
   } while (1);\r
 \r