Re: [patch 5/8] FatPkg\EnhancedFatDxe: Use typedef for complex type

["Ni, Ruiyu" <ruiyu.ni@intel.com>]

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Regards,
Ray

>-----Original Message-----
>From: Bi, Dandan
>Sent: Thursday, December 8, 2016 6:54 PM
>To: edk2-devel@lists.01.org
>Cc: Ni, Ruiyu <ruiyu.ni@intel.com>
>Subject: [patch 5/8] FatPkg\EnhancedFatDxe: Use typedef for complex type
>
>Cc: Ruiyu Ni <ruiyu.ni@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Dandan Bi <dandan.bi@intel.com>
>---
> FatPkg/EnhancedFatDxe/Fat.h           | 36 ++++++++++++++++++++---------------
> FatPkg/EnhancedFatDxe/FatFileSystem.h | 10 ++++++----
> 2 files changed, 27 insertions(+), 19 deletions(-)
>
>diff --git a/FatPkg/EnhancedFatDxe/Fat.h b/FatPkg/EnhancedFatDxe/Fat.h
>index 42aa647..f49acee 100644
>--- a/FatPkg/EnhancedFatDxe/Fat.h
>+++ b/FatPkg/EnhancedFatDxe/Fat.h
>@@ -182,42 +182,48 @@ typedef struct {
> #define HASH_TABLE_MASK  (HASH_TABLE_SIZE - 1)
>
> //
> // The directory entry for opened directory
> //
>-typedef struct _FAT_DIRENT {
>+
>+typedef struct _FAT_DIRENT FAT_DIRENT;
>+typedef struct _FAT_ODIR FAT_ODIR;
>+typedef struct _FAT_OFILE FAT_OFILE;
>+typedef struct _FAT_VOLUME FAT_VOLUME;
>+
>+struct _FAT_DIRENT {
>   UINTN               Signature;
>   UINT16              EntryPos;               // The position of this directory entry in the parent directory file
>   UINT8               EntryCount;             // The count of the directory entry in the parent directory file
>   BOOLEAN             Invalid;                // Indicate whether this directory entry is valid
>   CHAR16              *FileString;            // The unicode long file name for this directory entry
>-  struct _FAT_OFILE   *OFile;                 // The OFile of the corresponding directory entry
>-  struct _FAT_DIRENT  *ShortNameForwardLink;  // Hash successor link for short filename
>-  struct _FAT_DIRENT  *LongNameForwardLink;   // Hash successor link for long filename
>+  FAT_OFILE           *OFile;                 // The OFile of the corresponding directory entry
>+  FAT_DIRENT          *ShortNameForwardLink;  // Hash successor link for short filename
>+  FAT_DIRENT          *LongNameForwardLink;   // Hash successor link for long filename
>   LIST_ENTRY          Link;                   // Connection of every directory entry
>   FAT_DIRECTORY_ENTRY Entry;                  // The physical directory entry stored in disk
>-} FAT_DIRENT;
>+};
>
>-typedef struct _FAT_ODIR {
>+struct _FAT_ODIR {
>   UINTN               Signature;
>   UINT32              CurrentEndPos;          // Current end position of the directory
>   UINT32              CurrentPos;             // Current position of the directory
>   LIST_ENTRY          *CurrentCursor;         // Current directory entry pointer
>   LIST_ENTRY          ChildList;              // List of all directory entries
>   BOOLEAN             EndOfDir;               // Indicate whether we have reached the end of the directory
>   LIST_ENTRY          DirCacheLink;           // Linked in Volume->DirCacheList when discarded
>   UINTN               DirCacheTag;            // The identification of the directory when in directory cache
>   FAT_DIRENT          *LongNameHashTable[HASH_TABLE_SIZE];
>   FAT_DIRENT          *ShortNameHashTable[HASH_TABLE_SIZE];
>-} FAT_ODIR;
>+};
>
> typedef struct {
>   UINTN               Signature;
>   EFI_FILE_PROTOCOL   Handle;
>   UINT64              Position;
>   BOOLEAN             ReadOnly;
>-  struct _FAT_OFILE   *OFile;
>+  FAT_OFILE          *OFile;
>   LIST_ENTRY          Tasks;                  // List of all FAT_TASKs
>   LIST_ENTRY          Link;                   // Link to other IFiles
> } FAT_IFILE;
>
> typedef struct {
>@@ -240,13 +246,13 @@ typedef struct {
> } FAT_SUBTASK;
>
> //
> // FAT_OFILE - Each opened file
> //
>-typedef struct _FAT_OFILE {
>+struct _FAT_OFILE {
>   UINTN               Signature;
>-  struct _FAT_VOLUME  *Volume;
>+  FAT_VOLUME          *Volume;
>   //
>   // A permanant error code to return to all accesses to
>   // this opened file
>   //
>   EFI_STATUS          Error;
>@@ -282,11 +288,11 @@ typedef struct _FAT_OFILE {
>   UINT64              PosDisk;  // on the disk
>   UINTN               PosRem;   // remaining in this disk run
>   //
>   // The opened parent, full path length and currently opened child files
>   //
>-  struct _FAT_OFILE   *Parent;
>+  FAT_OFILE           *Parent;
>   UINTN               FullPathLen;
>   LIST_ENTRY          ChildHead;
>   LIST_ENTRY          ChildLink;
>
>   //
>@@ -301,13 +307,13 @@ typedef struct _FAT_OFILE {
>
>   //
>   // Link in Volume's reference list
>   //
>   LIST_ENTRY          CheckLink;
>-} FAT_OFILE;
>+};
>
>-typedef struct _FAT_VOLUME {
>+struct _FAT_VOLUME {
>   UINTN                           Signature;
>
>   EFI_HANDLE                      Handle;
>   BOOLEAN                         Valid;
>   BOOLEAN                         DiskError;
>@@ -364,11 +370,11 @@ typedef struct _FAT_VOLUME {
>   FAT_DIRENT                      RootDirEnt;
>   //
>   // File Name of root OFile, it is empty string
>   //
>   CHAR16                          RootFileString[1];
>-  struct _FAT_OFILE               *Root;
>+  FAT_OFILE                       *Root;
>
>   //
>   // New OFiles are added to this list so they
>   // can be cleaned up if they aren't referenced.
>   //
>@@ -383,11 +389,11 @@ typedef struct _FAT_VOLUME {
>   //
>   // Disk Cache for this volume
>   //
>   VOID                            *CacheBuffer;
>   DISK_CACHE                      DiskCache[CacheMaxType];
>-} FAT_VOLUME;
>+};
>
> //
> // Function Prototypes
> //
> EFI_STATUS
>diff --git a/FatPkg/EnhancedFatDxe/FatFileSystem.h b/FatPkg/EnhancedFatDxe/FatFileSystem.h
>index bcef258..3f89a34 100644
>--- a/FatPkg/EnhancedFatDxe/FatFileSystem.h
>+++ b/FatPkg/EnhancedFatDxe/FatFileSystem.h
>@@ -144,16 +144,18 @@ typedef struct {
>   CHAR8   Id[4];
>   CHAR8   FatLabel[11];
>   CHAR8   SystemId[8];
> } FAT32_BOOT_SECTOR_EXT;
>
>-typedef struct {
>-  FAT_BOOT_SECTOR_BASIC   FatBsb;
>-  union {
>+typedef union {
>     FAT_BOOT_SECTOR_EXT   FatBse;
>     FAT32_BOOT_SECTOR_EXT Fat32Bse;
>-  } FatBse;
>+  } FAT_BSE;
>+
>+typedef struct {
>+  FAT_BOOT_SECTOR_BASIC   FatBsb;
>+  FAT_BSE  FatBse;
> } FAT_BOOT_SECTOR;
>
> //
> // FAT Info Structure
> //
>--
>1.9.5.msysgit.1