diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2016-10-26 19:05:48 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2016-10-27 11:10:56 +0200 |
| commit | f0209935adfc0af448574eca7808691df36c8ea4 (patch) | |
| tree | 7e33cfde61deb9eb4fddd3ab9fbc458c8233c62a /MdeModulePkg/Library/UefiBootManagerLib | |
| parent | a031a53fa499f7be8a71d0c76134de6392495548 (diff) | |
| download | edk2-f0209935adfc0af448574eca7808691df36c8ea4.tar.gz edk2-f0209935adfc0af448574eca7808691df36c8ea4.tar.bz2 edk2-f0209935adfc0af448574eca7808691df36c8ea4.zip | |
MdeModulePkg/UefiBootManagerLib: rebase to ARRAY_SIZE()
Cc: Feng Tian <feng.tian@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@Intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'MdeModulePkg/Library/UefiBootManagerLib')
4 files changed, 5 insertions, 5 deletions
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c index f086764f24..050647d8f1 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c @@ -632,7 +632,7 @@ BmGetBootDescription ( // Firstly get the default boot description
//
DefaultDescription = NULL;
- for (Index = 0; Index < sizeof (mBmBootDescriptionHandlers) / sizeof (mBmBootDescriptionHandlers[0]); Index++) {
+ for (Index = 0; Index < ARRAY_SIZE (mBmBootDescriptionHandlers); Index++) {
DefaultDescription = mBmBootDescriptionHandlers[Index] (Handle);
if (DefaultDescription != NULL) {
//
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c b/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c index 4059dac49e..80511814ee 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c @@ -430,7 +430,7 @@ EfiBootManagerUpdateConsoleVariable ( EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;
EFI_DEVICE_PATH_PROTOCOL *TempNewDevicePath;
- if (ConsoleType >= sizeof (mConVarName) / sizeof (mConVarName[0])) {
+ if (ConsoleType >= ARRAY_SIZE (mConVarName)) {
return EFI_INVALID_PARAMETER;
}
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c index 55df7e9a5f..35131a94f6 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c @@ -680,7 +680,7 @@ BmProcessKeyOption ( KeyShiftStateCount = 0;
BmGenerateKeyShiftState (0, KeyOption, EFI_SHIFT_STATE_VALID, KeyShiftStates, &KeyShiftStateCount);
- ASSERT (KeyShiftStateCount <= sizeof (KeyShiftStates) / sizeof (KeyShiftStates[0]));
+ ASSERT (KeyShiftStateCount <= ARRAY_SIZE (KeyShiftStates));
EfiAcquireLock (&mBmHotkeyLock);
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c index 9af98de0af..e638e5fc67 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c @@ -796,7 +796,7 @@ EfiBootManagerIsValidLoadOptionVariableName ( return FALSE;
}
- for (Index = 0; Index < sizeof (mBmLoadOptionName) / sizeof (mBmLoadOptionName[0]); Index++) {
+ for (Index = 0; Index < ARRAY_SIZE (mBmLoadOptionName); Index++) {
if ((VariableNameLen - 4 == StrLen (mBmLoadOptionName[Index])) &&
(StrnCmp (VariableName, mBmLoadOptionName[Index], VariableNameLen - 4) == 0)
) {
@@ -804,7 +804,7 @@ EfiBootManagerIsValidLoadOptionVariableName ( }
}
- if (Index == sizeof (mBmLoadOptionName) / sizeof (mBmLoadOptionName[0])) {
+ if (Index == ARRAY_SIZE (mBmLoadOptionName)) {
return FALSE;
}
|