EdkCompatibilityPkg/Sample/Tools: rebase to ARRAY_SIZE()
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c b/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c
index cf8efc8..f787ae8 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c
@@ -397,8 +397,8 @@
UINT8 CodeType
)
{
- if (CodeType >= sizeof (mCodeTypeStr) / sizeof (*mCodeTypeStr)) {
- CodeType = sizeof (mCodeTypeStr) / sizeof (*mCodeTypeStr) - 1;
+ if (CodeType >= ARRAY_SIZE (mCodeTypeStr)) {
+ CodeType = ARRAY_SIZE (mCodeTypeStr) - 1;
}
return mCodeTypeStr[CodeType];
}
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/HiiPack/IfrParse.c b/EdkCompatibilityPkg/Sample/Tools/Source/HiiPack/IfrParse.c
index e69af5c..e60a2d9 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/HiiPack/IfrParse.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/HiiPack/IfrParse.c
@@ -470,7 +470,7 @@
IfrParse2A
},
};
-#define PARSE_TABLE_ENTRIES (sizeof (mIfrParseTable) / sizeof (mIfrParseTable[0]))
+#define PARSE_TABLE_ENTRIES (ARRAY_SIZE (mIfrParseTable))
static
STATUS
