MdeModulePkg: Use BM_OPTION_NAME_LEN instead of sizeof L"Boot####"

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Sunny Wang <sunnywang@hpe.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18856 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
index ff1cbe933ce1d8b921d7a983129ef0cda345e2d1..f9023572557321a190b6b691f570013d453cfe6a 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
@@ -45,7 +45,7 @@ BmIsKeyOptionValid (
   IN EFI_BOOT_MANAGER_KEY_OPTION     *KeyOption\r
 )\r
 {\r
-  UINT16   OptionName[sizeof (L"Boot####")];\r
+  UINT16   OptionName[BM_OPTION_NAME_LEN];\r
   UINT8    *BootOption;\r
   UINTN    BootOptionSize;\r
   UINT32   Crc;\r
@@ -349,7 +349,7 @@ BmHotkeyCallback (
 {\r
   LIST_ENTRY                    *Link;\r
   BM_HOTKEY                     *Hotkey;\r
-  CHAR16                        OptionName[sizeof ("Boot####")];\r
+  CHAR16                        OptionName[BM_OPTION_NAME_LEN];\r
   EFI_STATUS                    Status;\r
   EFI_KEY_DATA                  *HotkeyData;\r
 \r
@@ -905,13 +905,13 @@ EfiBootManagerAddKeyOptionVariable (
   VA_LIST                        Args;\r
   VOID                           *BootOption;\r
   UINTN                          BootOptionSize;\r
-  CHAR16                         BootOptionName[sizeof (L"Boot####")];\r
+  CHAR16                         BootOptionName[BM_OPTION_NAME_LEN];\r
   EFI_BOOT_MANAGER_KEY_OPTION    KeyOption;\r
   EFI_BOOT_MANAGER_KEY_OPTION    *KeyOptions;\r
   UINTN                          KeyOptionCount;\r
   UINTN                          Index;\r
   UINTN                          KeyOptionNumber;\r
-  CHAR16                         KeyOptionName[sizeof (L"Key####")];\r
+  CHAR16                         KeyOptionName[sizeof ("Key####")];\r
 \r
   UnicodeSPrint (BootOptionName, sizeof (BootOptionName), L"Boot%04x", BootOptionNumber);\r
   GetEfiGlobalVariable2 (BootOptionName, &BootOption, &BootOptionSize);\r
@@ -1018,7 +1018,7 @@ EfiBootManagerDeleteKeyOptionVariable (
   BM_HOTKEY                      *Hotkey;\r
   UINT32                         ShiftState;\r
   BOOLEAN                        Match;\r
-  CHAR16                         KeyOptionName[sizeof (L"Key####")];\r
+  CHAR16                         KeyOptionName[sizeof ("Key####")];\r
 \r
   ZeroMem (&KeyOption, sizeof (EFI_BOOT_MANAGER_KEY_OPTION));\r
   VA_START (Args, Modifier);\r