FatPkg/EnhancedFatDxe: rebase to ARRAY_SIZE()

Cc: Ruiyu Ni <ruiyu.ni@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: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/FatPkg/EnhancedFatDxe/DirectoryManage.c b/FatPkg/EnhancedFatDxe/DirectoryManage.c
index 91e7599e272258e465f485c35416af0f33c16208..3328ae31fed9432c282d935c73fa217d21b7d1ca 100644 (file)
--- a/FatPkg/EnhancedFatDxe/DirectoryManage.c
+++ b/FatPkg/EnhancedFatDxe/DirectoryManage.c
@@ -118,7 +118,7 @@ Returns:
     SetMem (LfnBuffer, sizeof (CHAR16) * LFN_CHAR_TOTAL * EntryCount, 0xff);\r
     Status = StrCpyS (\r
                LfnBuffer,\r
-               sizeof (LfnBuffer) / sizeof (LfnBuffer[0]),\r
+               ARRAY_SIZE (LfnBuffer),\r
                DirEnt->FileString\r
                );\r
     if (EFI_ERROR (Status)) {\r
@@ -360,7 +360,7 @@ Returns:
     FatGetFileNameViaCaseFlag (\r
       DirEnt,\r
       LfnBuffer,\r
-      sizeof (LfnBuffer) / sizeof (LfnBuffer[0])\r
+      ARRAY_SIZE (LfnBuffer)\r
       );\r
   }\r
 \r

diff --git a/FatPkg/EnhancedFatDxe/FileName.c b/FatPkg/EnhancedFatDxe/FileName.c
index 551cda53b9a4e5b968d4d5f364a61066b7471828..5df403625d640742ea7d1ba32f78daa6c70be04d 100644 (file)
--- a/FatPkg/EnhancedFatDxe/FileName.c
+++ b/FatPkg/EnhancedFatDxe/FileName.c
@@ -310,7 +310,7 @@ Returns:
   // Lower case a copy of the string, if it matches the\r
   // original then the string is lower case\r
   //\r
-  StrCpyS (Buffer, sizeof (Buffer) / sizeof (Buffer[0]), Str);\r
+  StrCpyS (Buffer, ARRAY_SIZE (Buffer), Str);\r
   FatStrLwr (Buffer);\r
   if (StrCmp (Str, Buffer) == 0) {\r
     OutCaseFlag = InCaseFlag;\r
@@ -319,7 +319,7 @@ Returns:
   // Upper case a copy of the string, if it matches the\r
   // original then the string is upper case\r
   //\r
-  StrCpyS (Buffer, sizeof (Buffer) / sizeof (Buffer[0]), Str);\r
+  StrCpyS (Buffer, ARRAY_SIZE (Buffer), Str);\r
   FatStrUpr (Buffer);\r
   if (StrCmp (Str, Buffer) == 0) {\r
     OutCaseFlag = 0;\r

diff --git a/FatPkg/EnhancedFatDxe/Hash.c b/FatPkg/EnhancedFatDxe/Hash.c
index 3d0ffe6fb8793c53cfefda4c3f333eda17795a3e..f827368ef5ebfe8bc4e3cd2d91f4ea8930c14515 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Hash.c
+++ b/FatPkg/EnhancedFatDxe/Hash.c
@@ -49,9 +49,9 @@ Returns:
   CHAR16  UpCasedLongFileName[EFI_PATH_STRING_LENGTH];\r
   StrnCpyS (\r
     UpCasedLongFileName,\r
-    sizeof (UpCasedLongFileName) / sizeof (UpCasedLongFileName[0]),\r
+    ARRAY_SIZE (UpCasedLongFileName),\r
     LongNameString,\r
-    sizeof (UpCasedLongFileName) / sizeof (UpCasedLongFileName[0]) - 1\r
+    ARRAY_SIZE (UpCasedLongFileName) - 1\r
     );\r
   FatStrUpr (UpCasedLongFileName);\r
   gBS->CalculateCrc32 (UpCasedLongFileName, StrSize (UpCasedLongFileName), &HashValue);\r