summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2016-10-26 18:33:08 +0200
committerLaszlo Ersek <lersek@redhat.com>2016-10-27 11:10:54 +0200
commit0cdc10bdca1c0e1a002815f1193cc4a6452dc5e7 (patch)
treead6db5820aa58d44bd07fcb84c8a972f4de4bff3
parentbd79132f3e715b41ebc1732238b1497a6fab833a (diff)
downloadedk2-0cdc10bdca1c0e1a002815f1193cc4a6452dc5e7.tar.gz
edk2-0cdc10bdca1c0e1a002815f1193cc4a6452dc5e7.tar.bz2
edk2-0cdc10bdca1c0e1a002815f1193cc4a6452dc5e7.zip
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>
-rw-r--r--FatPkg/EnhancedFatDxe/DirectoryManage.c4
-rw-r--r--FatPkg/EnhancedFatDxe/FileName.c4
-rw-r--r--FatPkg/EnhancedFatDxe/Hash.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/FatPkg/EnhancedFatDxe/DirectoryManage.c b/FatPkg/EnhancedFatDxe/DirectoryManage.c
index 91e7599e27..3328ae31fe 100644
--- a/FatPkg/EnhancedFatDxe/DirectoryManage.c
+++ b/FatPkg/EnhancedFatDxe/DirectoryManage.c
@@ -118,7 +118,7 @@ Returns:
SetMem (LfnBuffer, sizeof (CHAR16) * LFN_CHAR_TOTAL * EntryCount, 0xff);
Status = StrCpyS (
LfnBuffer,
- sizeof (LfnBuffer) / sizeof (LfnBuffer[0]),
+ ARRAY_SIZE (LfnBuffer),
DirEnt->FileString
);
if (EFI_ERROR (Status)) {
@@ -360,7 +360,7 @@ Returns:
FatGetFileNameViaCaseFlag (
DirEnt,
LfnBuffer,
- sizeof (LfnBuffer) / sizeof (LfnBuffer[0])
+ ARRAY_SIZE (LfnBuffer)
);
}
diff --git a/FatPkg/EnhancedFatDxe/FileName.c b/FatPkg/EnhancedFatDxe/FileName.c
index 551cda53b9..5df403625d 100644
--- 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
// original then the string is lower case
//
- StrCpyS (Buffer, sizeof (Buffer) / sizeof (Buffer[0]), Str);
+ StrCpyS (Buffer, ARRAY_SIZE (Buffer), Str);
FatStrLwr (Buffer);
if (StrCmp (Str, Buffer) == 0) {
OutCaseFlag = InCaseFlag;
@@ -319,7 +319,7 @@ Returns:
// Upper case a copy of the string, if it matches the
// original then the string is upper case
//
- StrCpyS (Buffer, sizeof (Buffer) / sizeof (Buffer[0]), Str);
+ StrCpyS (Buffer, ARRAY_SIZE (Buffer), Str);
FatStrUpr (Buffer);
if (StrCmp (Str, Buffer) == 0) {
OutCaseFlag = 0;
diff --git a/FatPkg/EnhancedFatDxe/Hash.c b/FatPkg/EnhancedFatDxe/Hash.c
index 3d0ffe6fb8..f827368ef5 100644
--- a/FatPkg/EnhancedFatDxe/Hash.c
+++ b/FatPkg/EnhancedFatDxe/Hash.c
@@ -49,9 +49,9 @@ Returns:
CHAR16 UpCasedLongFileName[EFI_PATH_STRING_LENGTH];
StrnCpyS (
UpCasedLongFileName,
- sizeof (UpCasedLongFileName) / sizeof (UpCasedLongFileName[0]),
+ ARRAY_SIZE (UpCasedLongFileName),
LongNameString,
- sizeof (UpCasedLongFileName) / sizeof (UpCasedLongFileName[0]) - 1
+ ARRAY_SIZE (UpCasedLongFileName) - 1
);
FatStrUpr (UpCasedLongFileName);
gBS->CalculateCrc32 (UpCasedLongFileName, StrSize (UpCasedLongFileName), &HashValue);