MdeModulePkg/UdfDxe: Refine enum member naming style

Similar to the naming style for variables, it's better for the name of
members in a enum type to avoid using only upper-case letters.

Cc: Paulo Alcantara <pcacjr@zytor.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Paulo Alcantara <pcacjr@zytor.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
index dfbf6b3f959792d4db1fd276c29685474a731b70..5df267761ff6e2c0c115a17342136b38f4834b60 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
+++ b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
@@ -710,9 +710,9 @@ GetLongAdFromAds (
     // If it's either an indirect AD (Extended Alllocation Descriptor) or an\r
     // allocated AD, then return it.\r
     //\r
     // If it's either an indirect AD (Extended Alllocation Descriptor) or an\r
     // allocated AD, then return it.\r
     //\r

-    ExtentFlags = GET_EXTENT_FLAGS (LONG_ADS_SEQUENCE, LongAd);\r
-    if (ExtentFlags == EXTENT_IS_NEXT_EXTENT ||\r
-        ExtentFlags == EXTENT_RECORDED_AND_ALLOCATED) {\r
+    ExtentFlags = GET_EXTENT_FLAGS (LongAdsSequence, LongAd);\r
+    if (ExtentFlags == ExtentIsNextExtent ||\r
+        ExtentFlags == ExtentRecordedAndAllocated) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r


@@ -720,7 +720,7 @@ GetLongAdFromAds (
     // This AD is either not recorded but allocated, or not recorded and not\r
     // allocated. Skip it.\r
     //\r
     // This AD is either not recorded but allocated, or not recorded and not\r
     // allocated. Skip it.\r
     //\r

-    *Offset += AD_LENGTH (LONG_ADS_SEQUENCE);\r
+    *Offset += AD_LENGTH (LongAdsSequence);\r

   }\r
 \r
   *FoundLongAd = LongAd;\r
   }\r
 \r
   *FoundLongAd = LongAd;\r


@@ -766,9 +766,9 @@ GetShortAdFromAds (
     // If it's either an indirect AD (Extended Alllocation Descriptor) or an\r
     // allocated AD, then return it.\r
     //\r
     // If it's either an indirect AD (Extended Alllocation Descriptor) or an\r
     // allocated AD, then return it.\r
     //\r

-    ExtentFlags = GET_EXTENT_FLAGS (SHORT_ADS_SEQUENCE, ShortAd);\r
-    if (ExtentFlags == EXTENT_IS_NEXT_EXTENT ||\r
-        ExtentFlags == EXTENT_RECORDED_AND_ALLOCATED) {\r
+    ExtentFlags = GET_EXTENT_FLAGS (ShortAdsSequence, ShortAd);\r
+    if (ExtentFlags == ExtentIsNextExtent ||\r
+        ExtentFlags == ExtentRecordedAndAllocated) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r


@@ -776,7 +776,7 @@ GetShortAdFromAds (
     // This AD is either not recorded but allocated, or not recorded and not\r
     // allocated. Skip it.\r
     //\r
     // This AD is either not recorded but allocated, or not recorded and not\r
     // allocated. Skip it.\r
     //\r

-    *Offset += AD_LENGTH (SHORT_ADS_SEQUENCE);\r
+    *Offset += AD_LENGTH (ShortAdsSequence);\r

   }\r
 \r
   *FoundShortAd = ShortAd;\r
   }\r
 \r
   *FoundShortAd = ShortAd;\r


@@ -808,14 +808,14 @@ GetAllocationDescriptor (
   OUT     VOID                    **FoundAd\r
   )\r
 {\r
   OUT     VOID                    **FoundAd\r
   )\r
 {\r

-  if (RecordingFlags == LONG_ADS_SEQUENCE) {\r
+  if (RecordingFlags == LongAdsSequence) {\r

     return GetLongAdFromAds (\r
       Data,\r
       Offset,\r
       Length,\r
       (UDF_LONG_ALLOCATION_DESCRIPTOR **)FoundAd\r
       );\r
     return GetLongAdFromAds (\r
       Data,\r
       Offset,\r
       Length,\r
       (UDF_LONG_ALLOCATION_DESCRIPTOR **)FoundAd\r
       );\r

-  } else if (RecordingFlags == SHORT_ADS_SEQUENCE) {\r
+  } else if (RecordingFlags == ShortAdsSequence) {\r

     return GetShortAdFromAds (\r
       Data,\r
       Offset,\r
     return GetShortAdFromAds (\r
       Data,\r
       Offset,\r


@@ -846,9 +846,9 @@ GetAllocationDescriptorLsn (
   IN VOID                            *Ad\r
   )\r
 {\r
   IN VOID                            *Ad\r
   )\r
 {\r

-  if (RecordingFlags == LONG_ADS_SEQUENCE) {\r
+  if (RecordingFlags == LongAdsSequence) {\r

     return GetLongAdLsn (Volume, (UDF_LONG_ALLOCATION_DESCRIPTOR *)Ad);\r
     return GetLongAdLsn (Volume, (UDF_LONG_ALLOCATION_DESCRIPTOR *)Ad);\r

-  } else if (RecordingFlags == SHORT_ADS_SEQUENCE) {\r
+  } else if (RecordingFlags == ShortAdsSequence) {\r

     return GetShortAdLsn (\r
       GetPdFromLongAd (Volume, ParentIcb),\r
       (UDF_SHORT_ALLOCATION_DESCRIPTOR *)Ad\r
     return GetShortAdLsn (\r
       GetPdFromLongAd (Volume, ParentIcb),\r
       (UDF_SHORT_ALLOCATION_DESCRIPTOR *)Ad\r


@@ -1115,8 +1115,8 @@ ReadFile (
   Data = NULL;\r
 \r
   switch (ReadFileInfo->Flags) {\r
   Data = NULL;\r
 \r
   switch (ReadFileInfo->Flags) {\r

-  case READ_FILE_GET_FILESIZE:\r
-  case READ_FILE_ALLOCATE_AND_READ:\r
+  case ReadFileGetFileSize:\r
+  case ReadFileAllocateAndRead:\r

     //\r
     // Initialise ReadFileInfo structure for either getting file size, or\r
     // reading file's recorded data.\r
     //\r
     // Initialise ReadFileInfo structure for either getting file size, or\r
     // reading file's recorded data.\r


@@ -1124,7 +1124,7 @@ ReadFile (
     ReadFileInfo->ReadLength = 0;\r
     ReadFileInfo->FileData = NULL;\r
     break;\r
     ReadFileInfo->ReadLength = 0;\r
     ReadFileInfo->FileData = NULL;\r
     break;\r

-  case READ_FILE_SEEK_AND_READ:\r
+  case ReadFileSeekAndRead:\r

     //\r
     // About to seek a file and/or read its data.\r
     //\r
     //\r
     // About to seek a file and/or read its data.\r
     //\r


@@ -1149,15 +1149,15 @@ ReadFile (
 \r
   RecordingFlags = GET_FE_RECORDING_FLAGS (FileEntryData);\r
   switch (RecordingFlags) {\r
 \r
   RecordingFlags = GET_FE_RECORDING_FLAGS (FileEntryData);\r
   switch (RecordingFlags) {\r

-  case INLINE_DATA:\r
+  case InlineData:\r

     //\r
     // There are no extents for this FE/EFE. All data is inline.\r
     //\r
     GetFileEntryData (FileEntryData, &Data, &Length);\r
 \r
     //\r
     // There are no extents for this FE/EFE. All data is inline.\r
     //\r
     GetFileEntryData (FileEntryData, &Data, &Length);\r
 \r

-    if (ReadFileInfo->Flags == READ_FILE_GET_FILESIZE) {\r
+    if (ReadFileInfo->Flags == ReadFileGetFileSize) {\r

       ReadFileInfo->ReadLength = Length;\r
       ReadFileInfo->ReadLength = Length;\r

-    } else if (ReadFileInfo->Flags == READ_FILE_ALLOCATE_AND_READ) {\r
+    } else if (ReadFileInfo->Flags == ReadFileAllocateAndRead) {\r

       //\r
       // Allocate buffer for starting read data.\r
       //\r
       //\r
       // Allocate buffer for starting read data.\r
       //\r


@@ -1171,7 +1171,7 @@ ReadFile (
       //\r
       CopyMem (ReadFileInfo->FileData, Data, (UINTN) Length);\r
       ReadFileInfo->ReadLength = Length;\r
       //\r
       CopyMem (ReadFileInfo->FileData, Data, (UINTN) Length);\r
       ReadFileInfo->ReadLength = Length;\r

-    } else if (ReadFileInfo->Flags == READ_FILE_SEEK_AND_READ) {\r
+    } else if (ReadFileInfo->Flags == ReadFileSeekAndRead) {\r

       //\r
       // If FilePosition is non-zero, seek file to FilePosition, read\r
       // FileDataSize bytes and then updates FilePosition.\r
       //\r
       // If FilePosition is non-zero, seek file to FilePosition, read\r
       // FileDataSize bytes and then updates FilePosition.\r


@@ -1191,8 +1191,8 @@ ReadFile (
     Status = EFI_SUCCESS;\r
     break;\r
 \r
     Status = EFI_SUCCESS;\r
     break;\r
 \r

-  case LONG_ADS_SEQUENCE:\r
-  case SHORT_ADS_SEQUENCE:\r
+  case LongAdsSequence:\r
+  case ShortAdsSequence:\r

     //\r
     // This FE/EFE contains a run of Allocation Descriptors. Get data + size\r
     // for start reading them out.\r
     //\r
     // This FE/EFE contains a run of Allocation Descriptors. Get data + size\r
     // for start reading them out.\r


@@ -1220,7 +1220,7 @@ ReadFile (
       // Check if AD is an indirect AD. If so, read Allocation Extent\r
       // Descriptor and its extents (ADs).\r
       //\r
       // Check if AD is an indirect AD. If so, read Allocation Extent\r
       // Descriptor and its extents (ADs).\r
       //\r

-      if (GET_EXTENT_FLAGS (RecordingFlags, Ad) == EXTENT_IS_NEXT_EXTENT) {\r
+      if (GET_EXTENT_FLAGS (RecordingFlags, Ad) == ExtentIsNextExtent) {\r

         if (!DoFreeAed) {\r
           DoFreeAed = TRUE;\r
         } else {\r
         if (!DoFreeAed) {\r
           DoFreeAed = TRUE;\r
         } else {\r


@@ -1254,10 +1254,10 @@ ReadFile (
                                         Ad);\r
 \r
       switch (ReadFileInfo->Flags) {\r
                                         Ad);\r
 \r
       switch (ReadFileInfo->Flags) {\r

-      case READ_FILE_GET_FILESIZE:\r
+      case ReadFileGetFileSize:\r

         ReadFileInfo->ReadLength += ExtentLength;\r
         break;\r
         ReadFileInfo->ReadLength += ExtentLength;\r
         break;\r

-      case READ_FILE_ALLOCATE_AND_READ:\r
+      case ReadFileAllocateAndRead:\r

         //\r
         // Increase FileData (if necessary) to read next extent.\r
         //\r
         //\r
         // Increase FileData (if necessary) to read next extent.\r
         //\r


@@ -1288,7 +1288,7 @@ ReadFile (
 \r
         ReadFileInfo->ReadLength += ExtentLength;\r
         break;\r
 \r
         ReadFileInfo->ReadLength += ExtentLength;\r
         break;\r

-      case READ_FILE_SEEK_AND_READ:\r
+      case ReadFileSeekAndRead:\r

         //\r
         // Seek file first before reading in its data.\r
         //\r
         //\r
         // Seek file first before reading in its data.\r
         //\r


@@ -1364,7 +1364,7 @@ ReadFile (
     }\r
 \r
     break;\r
     }\r
 \r
     break;\r

-  case EXTENDED_ADS_SEQUENCE:\r
+  case ExtendedAdsSequence:\r

      // FIXME: Not supported. Got no volume with it, yet.\r
     ASSERT (FALSE);\r
     Status = EFI_UNSUPPORTED;\r
      // FIXME: Not supported. Got no volume with it, yet.\r
     ASSERT (FALSE);\r
     Status = EFI_UNSUPPORTED;\r


@@ -1388,7 +1388,7 @@ Done:
 \r
 Error_Read_Disk_Blk:\r
 Error_Alloc_Buffer_To_Next_Ad:\r
 \r
 Error_Read_Disk_Blk:\r
 Error_Alloc_Buffer_To_Next_Ad:\r

-  if (ReadFileInfo->Flags != READ_FILE_SEEK_AND_READ) {\r
+  if (ReadFileInfo->Flags != ReadFileSeekAndRead) {\r

     FreePool (ReadFileInfo->FileData);\r
   }\r
 \r
     FreePool (ReadFileInfo->FileData);\r
   }\r
 \r


@@ -1911,7 +1911,7 @@ ReadDirectoryEntry (
     // The directory's recorded data has not been read yet. So let's cache it\r
     // into memory and the next calls won't need to read it again.\r
     //\r
     // The directory's recorded data has not been read yet. So let's cache it\r
     // into memory and the next calls won't need to read it again.\r
     //\r

-    ReadFileInfo.Flags = READ_FILE_ALLOCATE_AND_READ;\r
+    ReadFileInfo.Flags = ReadFileAllocateAndRead;\r

 \r
     Status = ReadFile (\r
       BlockIo,\r
 \r
     Status = ReadFile (\r
       BlockIo,\r


@@ -2061,7 +2061,7 @@ ResolveSymlink (
   // all its data here -- usually the data will be inline with the FE/EFE for\r
   // lower filenames.\r
   //\r
   // all its data here -- usually the data will be inline with the FE/EFE for\r
   // lower filenames.\r
   //\r

-  ReadFileInfo.Flags = READ_FILE_ALLOCATE_AND_READ;\r
+  ReadFileInfo.Flags = ReadFileAllocateAndRead;\r

 \r
   Status = ReadFile (\r
     BlockIo,\r
 \r
   Status = ReadFile (\r
     BlockIo,\r


@@ -2284,7 +2284,7 @@ GetFileSize (
   EFI_STATUS          Status;\r
   UDF_READ_FILE_INFO  ReadFileInfo;\r
 \r
   EFI_STATUS          Status;\r
   UDF_READ_FILE_INFO  ReadFileInfo;\r
 \r

-  ReadFileInfo.Flags = READ_FILE_GET_FILESIZE;\r
+  ReadFileInfo.Flags = ReadFileGetFileSize;\r

 \r
   Status = ReadFile (\r
     BlockIo,\r
 \r
   Status = ReadFile (\r
     BlockIo,\r


@@ -2610,7 +2610,7 @@ ReadFileData (
   EFI_STATUS          Status;\r
   UDF_READ_FILE_INFO  ReadFileInfo;\r
 \r
   EFI_STATUS          Status;\r
   UDF_READ_FILE_INFO  ReadFileInfo;\r
 \r

-  ReadFileInfo.Flags         = READ_FILE_SEEK_AND_READ;\r
+  ReadFileInfo.Flags         = ReadFileSeekAndRead;\r

   ReadFileInfo.FilePosition  = *FilePosition;\r
   ReadFileInfo.FileData      = Buffer;\r
   ReadFileInfo.FileDataSize  = *BufferSize;\r
   ReadFileInfo.FilePosition  = *FilePosition;\r
   ReadFileInfo.FileData      = Buffer;\r
   ReadFileInfo.FileDataSize  = *BufferSize;\r

diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/Udf.h b/MdeModulePkg/Universal/Disk/UdfDxe/Udf.h
index 641e0ae267c47a519e10e9cde8eea1f0c142ebc5..44c843fd4d33c7ab9cc24ef401c7daff44ffccaa 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UdfDxe/Udf.h
+++ b/MdeModulePkg/Universal/Disk/UdfDxe/Udf.h
@@ -106,10 +106,10 @@
          !IS_FID_PARENT_FILE (_Pointer)))\r
 \r
 typedef enum {\r
          !IS_FID_PARENT_FILE (_Pointer)))\r
 \r
 typedef enum {\r

-  SHORT_ADS_SEQUENCE,\r
-  LONG_ADS_SEQUENCE,\r
-  EXTENDED_ADS_SEQUENCE,\r
-  INLINE_DATA\r
+  ShortAdsSequence,\r
+  LongAdsSequence,\r
+  ExtendedAdsSequence,\r
+  InlineData\r

 } UDF_FE_RECORDING_FLAGS;\r
 \r
 #define GET_FE_RECORDING_FLAGS(_Fe) \\r
 } UDF_FE_RECORDING_FLAGS;\r
 \r
 #define GET_FE_RECORDING_FLAGS(_Fe) \\r


@@ -118,26 +118,26 @@ typedef enum {
                   sizeof (UDF_DESCRIPTOR_TAG)))->Flags & 0x07)\r
 \r
 typedef enum {\r
                   sizeof (UDF_DESCRIPTOR_TAG)))->Flags & 0x07)\r
 \r
 typedef enum {\r

-  EXTENT_RECORDED_AND_ALLOCATED,\r
-  EXTENT_NOT_RECORDED_BUT_ALLOCATED,\r
-  EXTENT_NOT_RECORDED_NOT_ALLOCATED,\r
-  EXTENT_IS_NEXT_EXTENT,\r
+  ExtentRecordedAndAllocated,\r
+  ExtentNotRecordedButAllocated,\r
+  ExtentNotRecordedNotAllocated,\r
+  ExtentIsNextExtent,\r

 } UDF_EXTENT_FLAGS;\r
 \r
 #define AD_LENGTH(_RecFlags) \\r
 } UDF_EXTENT_FLAGS;\r
 \r
 #define AD_LENGTH(_RecFlags) \\r

-  ((_RecFlags) == SHORT_ADS_SEQUENCE ? \\r
+  ((_RecFlags) == ShortAdsSequence ? \\r

    ((UINT64)(sizeof (UDF_SHORT_ALLOCATION_DESCRIPTOR))) : \\r
    ((UINT64)(sizeof (UDF_LONG_ALLOCATION_DESCRIPTOR))))\r
 \r
 #define GET_EXTENT_FLAGS(_RecFlags, _Ad) \\r
    ((UINT64)(sizeof (UDF_SHORT_ALLOCATION_DESCRIPTOR))) : \\r
    ((UINT64)(sizeof (UDF_LONG_ALLOCATION_DESCRIPTOR))))\r
 \r
 #define GET_EXTENT_FLAGS(_RecFlags, _Ad) \\r

-  ((_RecFlags) == SHORT_ADS_SEQUENCE ? \\r
+  ((_RecFlags) == ShortAdsSequence ? \\r

    ((UDF_EXTENT_FLAGS)((((UDF_SHORT_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength >> \\r
             30) & 0x3)) : \\r
    ((UDF_EXTENT_FLAGS)((((UDF_LONG_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength >> \\r
             30) & 0x3)))\r
 \r
 #define GET_EXTENT_LENGTH(_RecFlags, _Ad) \\r
    ((UDF_EXTENT_FLAGS)((((UDF_SHORT_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength >> \\r
             30) & 0x3)) : \\r
    ((UDF_EXTENT_FLAGS)((((UDF_LONG_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength >> \\r
             30) & 0x3)))\r
 \r
 #define GET_EXTENT_LENGTH(_RecFlags, _Ad) \\r

-  ((_RecFlags) == SHORT_ADS_SEQUENCE ? \\r
+  ((_RecFlags) == ShortAdsSequence ? \\r

    ((UINT32)((((UDF_SHORT_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength & \\r
           ~0xC0000000UL))) : \\r
    ((UINT32)((((UDF_LONG_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength & \\r
    ((UINT32)((((UDF_SHORT_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength & \\r
           ~0xC0000000UL))) : \\r
    ((UINT32)((((UDF_LONG_ALLOCATION_DESCRIPTOR *)(_Ad))->ExtentLength & \\r


@@ -169,9 +169,9 @@ typedef struct {
 #pragma pack()\r
 \r
 typedef enum {\r
 #pragma pack()\r
 \r
 typedef enum {\r

-  READ_FILE_GET_FILESIZE,\r
-  READ_FILE_ALLOCATE_AND_READ,\r
-  READ_FILE_SEEK_AND_READ,\r
+  ReadFileGetFileSize,\r
+  ReadFileAllocateAndRead,\r
+  ReadFileSeekAndRead,\r

 } UDF_READ_FILE_FLAGS;\r
 \r
 typedef struct {\r
 } UDF_READ_FILE_FLAGS;\r
 \r
 typedef struct {\r