MdeModulePkg/VarCheckHiiLib: rebase to ARRAY_SIZE()

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/Library/VarCheckHiiLib/VarCheckHiiGen.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
index 5cb056f3513591e69fca33b0f6cb7c8f019b30dc..f018c87ba199276fb65aabc82077e2d668f046f8 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
@@ -57,7 +57,7 @@ IfrOpCodeToStr (
   )\r
 {\r
   UINTN  Index;\r
-  for (Index = 0; Index < sizeof (mIfrOpCodeStringTable) / sizeof (mIfrOpCodeStringTable[0]); Index++) {\r
+  for (Index = 0; Index < ARRAY_SIZE (mIfrOpCodeStringTable); Index++) {\r
     if (mIfrOpCodeStringTable[Index].HiiOpCode == IfrOpCode) {\r
       return mIfrOpCodeStringTable[Index].HiiOpCodeStr;\r
     }\r
@@ -96,7 +96,7 @@ HiiPackageTypeToStr (
   )\r
 {\r
   UINTN     Index;\r
-  for (Index = 0; Index < sizeof (mPackageTypeStringTable) / sizeof (mPackageTypeStringTable[0]); Index++) {\r
+  for (Index = 0; Index < ARRAY_SIZE (mPackageTypeStringTable); Index++) {\r
     if (mPackageTypeStringTable[Index].PackageType == PackageType) {\r
       return mPackageTypeStringTable[Index].PackageTypeStr;\r
     }\r

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
index 3afa7962aa6128630718be322b3f1b9230655dd3..b9ca9084915b220ef84072db9f897f2d2adc0c2c 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
@@ -318,7 +318,7 @@ HiiOpCodeToStr (
   )\r
 {\r
   UINTN     Index;\r
-  for (Index = 0; Index < sizeof (mHiiOpCodeStringTable) / sizeof (mHiiOpCodeStringTable[0]); Index++) {\r
+  for (Index = 0; Index < ARRAY_SIZE (mHiiOpCodeStringTable); Index++) {\r
     if (mHiiOpCodeStringTable[Index].HiiOpCode == HiiOpCode) {\r
       return mHiiOpCodeStringTable[Index].HiiOpCodeStr;\r
     }\r