MdeModulePkg/DisplayEngineDxe: rebase to ARRAY_SIZE()

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Feng Tian <feng.tian@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: Feng Tian <feng.tian@Intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index 89ed3bb4d870912a3e88a4c9c5fa8fde0701d9bf..c2cffecbe9034454d4e1e4cc5a7b6eec55e8d6d1 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -49,7 +49,7 @@ SCAN_CODE_TO_SCREEN_OPERATION     gScanCodeToOperation[] = {
   }\r
 };\r
 \r
-UINTN mScanCodeNumber = sizeof (gScanCodeToOperation) / sizeof (gScanCodeToOperation[0]);\r
+UINTN mScanCodeNumber = ARRAY_SIZE (gScanCodeToOperation);\r
 \r
 SCREEN_OPERATION_T0_CONTROL_FLAG  gScreenOperationToControlFlag[] = {\r
   {\r
@@ -3248,7 +3248,7 @@ UiDisplayMenu (
       }\r
 \r
       for (Index = 0;\r
-           Index < sizeof (gScreenOperationToControlFlag) / sizeof (gScreenOperationToControlFlag[0]);\r
+           Index < ARRAY_SIZE (gScreenOperationToControlFlag);\r
            Index++\r
           ) {\r
         if (ScreenOperation == gScreenOperationToControlFlag[Index].ScreenOperation) {\r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
index 8e7b735c70635a14b27ed92e69c4d569a0b1b750..400b93427caa162e0310605da3766764082a228e 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
@@ -1070,14 +1070,14 @@ EnterCarriageReturn:
 \r
           if (ValidateFail) {\r
             UpdateStatusBar (INPUT_ERROR, TRUE);\r
-            ASSERT (Count < sizeof (PreviousNumber) / sizeof (PreviousNumber[0]));\r
+            ASSERT (Count < ARRAY_SIZE (PreviousNumber));\r
             EditValue = PreviousNumber[Count];\r
             break;\r
           }\r
         } else {\r
           if (EditValue > Maximum) {\r
             UpdateStatusBar (INPUT_ERROR, TRUE);\r
-            ASSERT (Count < sizeof (PreviousNumber) / sizeof (PreviousNumber[0]));\r
+            ASSERT (Count < ARRAY_SIZE (PreviousNumber));\r
             EditValue = PreviousNumber[Count];\r
             break;\r
           }\r
@@ -1086,7 +1086,7 @@ EnterCarriageReturn:
         UpdateStatusBar (INPUT_ERROR, FALSE);\r
 \r
         Count++;\r
-        ASSERT (Count < (sizeof (PreviousNumber) / sizeof (PreviousNumber[0])));\r
+        ASSERT (Count < (ARRAY_SIZE (PreviousNumber)));\r
         PreviousNumber[Count] = EditValue;\r
 \r
         gST->ConOut->SetAttribute (gST->ConOut, GetHighlightTextColor ());\r