diff options
| author | Eric Dong <eric.dong@intel.com> | 2013-12-26 04:19:37 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-12-26 04:19:37 +0000 |
| commit | 80873def607ba8056e5aab40eaa3be07e9a5ec19 (patch) | |
| tree | ca3c56dd737b1b7a6b2467adcefeb58e0586ca35 | |
| parent | b8b5ff5acd0d292bcd804e589d28677af5098573 (diff) | |
| download | edk2-80873def607ba8056e5aab40eaa3be07e9a5ec19.tar.gz edk2-80873def607ba8056e5aab40eaa3be07e9a5ec19.tar.bz2 edk2-80873def607ba8056e5aab40eaa3be07e9a5ec19.zip | |
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
4 files changed, 10 insertions, 8 deletions
diff --git a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h index 31e1091e88..bb4b2f4e8d 100644 --- a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h +++ b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h @@ -116,7 +116,7 @@ CreateDialog ( /**
Confirm how to handle the changed data.
- @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.
+ @return Action BROWSER_SAVE_CHANGES, BROWSER_DISCARD_CHANGES or other values.
**/
UINTN
EFIAPI
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c index 92f3a43a77..5b5f37d175 100644 --- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c +++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c @@ -543,7 +543,7 @@ CreateDialog ( /**
Confirm how to handle the changed data.
- @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.
+ @return Action BROWSER_SAVE_CHANGES, BROWSER_DISCARD_CHANGES or other values.
**/
UINTN
EFIAPI
@@ -573,11 +573,11 @@ ConfirmDataChange ( );
if (Key.ScanCode == SCAN_ESC) {
- return BROWSER_ACTION_NONE;
+ return BROWSER_NO_CHANGES;
} else if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (YesResponse | UPPER_LOWER_CASE_OFFSET)) {
- return BROWSER_ACTION_SUBMIT;
+ return BROWSER_SAVE_CHANGES;
} else {
- return BROWSER_ACTION_DISCARD;
+ return BROWSER_DISCARD_CHANGES;
}
}
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c index f8b1d5067e..788a63f4e4 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c @@ -1263,15 +1263,15 @@ ProcessChangedData ( RetValue = TRUE;
switch (mFormDisplay->ConfirmDataChange()) {
- case BROWSER_ACTION_DISCARD:
+ case BROWSER_DISCARD_CHANGES:
DiscardForm (Selection->FormSet, Selection->Form, Scope);
break;
- case BROWSER_ACTION_SUBMIT:
+ case BROWSER_SAVE_CHANGES:
SubmitForm (Selection->FormSet, Selection->Form, Scope);
break;
- case BROWSER_ACTION_NONE:
+ case BROWSER_NO_CHANGES:
RetValue = FALSE;
break;
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index c7c7f9ae43..3671c0ed1c 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -5062,6 +5062,8 @@ SaveReminder ( } else if (DataSavedAction == BROWSER_DISCARD_CHANGES) {
DiscardForm (NULL, NULL, SystemLevel);
break;
+ } else if (DataSavedAction == BROWSER_NO_CHANGES) {
+ break;
}
} while (1);
|