FatPkg/EnhancedFatDxe: Make the variable name follow rule

[mirror_edk2.git] / FatPkg / EnhancedFatDxe / DirectoryManage.c

diff --git a/FatPkg/EnhancedFatDxe/DirectoryManage.c b/FatPkg/EnhancedFatDxe/DirectoryManage.c
index 91e7599e272258e465f485c35416af0f33c16208..149119dc2dba194ba60d8263fc57371838dfb57b 100644 (file)
--- a/FatPkg/EnhancedFatDxe/DirectoryManage.c
+++ b/FatPkg/EnhancedFatDxe/DirectoryManage.c
@@ -60,7 +60,7 @@ Returns:
     //\r
     // End of directory\r
     //\r
-    ASSERT (IoMode == READ_DATA);\r
+    ASSERT (IoMode == ReadData);\r
     ((FAT_DIRECTORY_ENTRY *) Entry)->FileName[0] = EMPTY_ENTRY_MARK;\r
     ((FAT_DIRECTORY_ENTRY *) Entry)->Attributes  = 0;\r
     return EFI_SUCCESS;\r
@@ -106,7 +106,7 @@ Returns:
   //\r
   // Write directory entry\r
   //\r
-  Status = FatAccessEntry (OFile, WRITE_DATA, EntryPos, &DirEnt->Entry);\r
+  Status = FatAccessEntry (OFile, WriteData, EntryPos, &DirEnt->Entry);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -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
@@ -147,7 +147,7 @@ Returns:
         LfnEntry.Ordinal = DELETE_ENTRY_MARK;\r
       }\r
 \r
-      Status = FatAccessEntry (OFile, WRITE_DATA, EntryPos, &LfnEntry);\r
+      Status = FatAccessEntry (OFile, WriteData, EntryPos, &LfnEntry);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -322,7 +322,7 @@ Returns:
     }\r
 \r
     EntryPos--;\r
-    Status = FatAccessEntry (Parent, READ_DATA, EntryPos, &LfnEntry);\r
+    Status = FatAccessEntry (Parent, ReadData, EntryPos, &LfnEntry);\r
     if (EFI_ERROR (Status) ||\r
         LfnEntry.Attributes != FAT_ATTRIBUTE_LFN ||\r
         LfnEntry.MustBeZero != 0 ||\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
@@ -442,7 +442,7 @@ Returns:
     //\r
     // Read the next directory entry until we find a valid directory entry (excluding lfn entry)\r
     //\r
-    Status = FatAccessEntry (OFile, READ_DATA, ODir->CurrentEndPos, &Entry);\r
+    Status = FatAccessEntry (OFile, ReadData, ODir->CurrentEndPos, &Entry);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -462,7 +462,7 @@ Returns:
     // Although FAT spec states this field is always 0 for FAT12 & FAT16, some applications\r
     // might use it for some special usage, it is safer to zero it in memory for FAT12 & FAT16.\r
     //\r
-    if (OFile->Volume->FatType != FAT32) {\r
+    if (OFile->Volume->FatType != Fat32) {\r
       Entry.FileClusterHigh = 0;\r
     }\r
 \r
@@ -857,7 +857,7 @@ Returns:
   Entry           = &DirEnt->Entry;\r
   DirEnt->Invalid = TRUE;\r
   do {\r
-    Status = FatAccessEntry (Root, READ_DATA, EntryPos, Entry);\r
+    Status = FatAccessEntry (Root, ReadData, EntryPos, Entry);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -1335,7 +1335,7 @@ Returns:
       Volume                = VOLUME_FROM_ROOT_DIRENT (DirEnt);\r
       Volume->Root          = OFile;\r
       OFile->FileCluster    = Volume->RootCluster;\r
-      if (Volume->FatType  != FAT32) {\r
+      if (Volume->FatType  != Fat32) {\r
         OFile->IsFixedRootDir  = TRUE;\r
       }\r
     }\r