edk2[18856] MdeModulePkg: Use BM_OPTION_NAME_LEN instead of sizeof L" Boot####"

[niruiyu]

Revision: 18856
          http://sourceforge.net/p/edk2/code/18856
Author:   niruiyu
Date:     2015-11-17 10:09:25 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
MdeModulePkg: Use BM_OPTION_NAME_LEN instead of sizeof L"Boot####"

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu...@intel.com>
Reviewed-by: Sunny Wang <sunnyw...@hpe.com>

Modified Paths:
--------------
    trunk/edk2/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c

Modified: trunk/edk2/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
===================================================================
--- trunk/edk2/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c       
2015-11-17 10:08:40 UTC (rev 18855)
+++ trunk/edk2/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c       
2015-11-17 10:09:25 UTC (rev 18856)
@@ -45,7 +45,7 @@
   IN EFI_BOOT_MANAGER_KEY_OPTION     *KeyOption
 )
 {
-  UINT16   OptionName[sizeof (L"Boot####")];
+  UINT16   OptionName[BM_OPTION_NAME_LEN];
   UINT8    *BootOption;
   UINTN    BootOptionSize;
   UINT32   Crc;
@@ -349,7 +349,7 @@
 {
   LIST_ENTRY                    *Link;
   BM_HOTKEY                     *Hotkey;
-  CHAR16                        OptionName[sizeof ("Boot####")];
+  CHAR16                        OptionName[BM_OPTION_NAME_LEN];
   EFI_STATUS                    Status;
   EFI_KEY_DATA                  *HotkeyData;
 
@@ -905,13 +905,13 @@
   VA_LIST                        Args;
   VOID                           *BootOption;
   UINTN                          BootOptionSize;
-  CHAR16                         BootOptionName[sizeof (L"Boot####")];
+  CHAR16                         BootOptionName[BM_OPTION_NAME_LEN];
   EFI_BOOT_MANAGER_KEY_OPTION    KeyOption;
   EFI_BOOT_MANAGER_KEY_OPTION    *KeyOptions;
   UINTN                          KeyOptionCount;
   UINTN                          Index;
   UINTN                          KeyOptionNumber;
-  CHAR16                         KeyOptionName[sizeof (L"Key####")];
+  CHAR16                         KeyOptionName[sizeof ("Key####")];
 
   UnicodeSPrint (BootOptionName, sizeof (BootOptionName), L"Boot%04x", 
BootOptionNumber);
   GetEfiGlobalVariable2 (BootOptionName, &BootOption, &BootOptionSize);
@@ -1018,7 +1018,7 @@
   BM_HOTKEY                      *Hotkey;
   UINT32                         ShiftState;
   BOOLEAN                        Match;
-  CHAR16                         KeyOptionName[sizeof (L"Key####")];
+  CHAR16                         KeyOptionName[sizeof ("Key####")];
 
   ZeroMem (&KeyOption, sizeof (EFI_BOOT_MANAGER_KEY_OPTION));
   VA_START (Args, Modifier);


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits