follow up the comments from code review.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5891 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 15 insertions, 12 deletions

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index c236282d46..16d66fa0d4 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -83,6 +83,9 @@ GetFwVolHeader (
   //

   FvhLength = sizeof (EFI_FIRMWARE_VOLUME_HEADER);

   Status = Fvb->Read (Fvb, 0, 0, &FvhLength, (UINT8 *)&TempFvh);

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

 

   //

   // Allocate a buffer for the caller

@@ -494,9 +497,9 @@ NotifyFwVolBlock (
 

 

 /**

-  This routine is the driver initialization entry point.  It initializes the

-  libraries, and registers two notification functions.  These notification

-  functions are responsible for building the FV stack dynamically.

+  This routine is the driver initialization entry point.  It registers

+  a notification function.  This notification function are responsible

+  for building the FV stack dynamically.

 

   @param  ImageHandle           The image handle.

   @param  SystemTable           The system table.

diff --git a/MdeModulePkg/Core/Dxe/FwVolDriver.h b/MdeModulePkg/Core/Dxe/FwVolDriver.h
index 6c2f1b9d8a..5acbacc7c7 100644
--- a/MdeModulePkg/Core/Dxe/FwVolDriver.h
+++ b/MdeModulePkg/Core/Dxe/FwVolDriver.h
@@ -51,10 +51,10 @@ typedef struct {
   Retrieves attributes, insures positive polarity of attribute bits, returns

   resulting attributes in output parameter.

 

-  @param  This             Calling context

-  @param  Attributes       output buffer which contains attributes

+  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.

+  @param  Attributes       output buffer which contains attributes.

 

-  @retval EFI_SUCCESS      Successfully got volume attributes

+  @retval EFI_SUCCESS      Successfully got volume attributes.

 

 **/

 EFI_STATUS

@@ -68,9 +68,9 @@ FvGetVolumeAttributes (
 /**

   Sets current attributes for volume

 

-  @param  This             Calling context

+  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.

   @param  Attributes       At input, contains attributes to be set.  At output

-                           contains new value of FV

+                           contains new value of FV.

 

   @retval EFI_UNSUPPORTED  Could not be set.

 

@@ -86,7 +86,7 @@ FvSetVolumeAttributes (
 /**

   Given the input key, search for the next matching file in the volume.

 

-  @param  This                       Indicates the calling context.

+  @param  This                       Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.

   @param  Key                        Key is a pointer to a caller allocated

                                      buffer that contains implementation specific

                                      data that is used to track where to begin

@@ -146,7 +146,7 @@ FvGetNextFile (
   Locates a file in the firmware volume and

   copies it to the supplied buffer.

 

-  @param  This                       Indicates the calling context.

+  @param  This                       Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.

   @param  NameGuid                   Pointer to an EFI_GUID, which is the

                                      filename.

   @param  Buffer                     Buffer is a pointer to pointer to a buffer

@@ -199,7 +199,7 @@ FvReadFile (
   Locates a section in a given FFS File and

   copies it to the supplied buffer (not including section header).

 

-  @param  This                       Indicates the calling context.

+  @param  This                       Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.

   @param  NameGuid                   Pointer to an EFI_GUID, which is the

                                      filename.

   @param  SectionType                Indicates the section type to return.

@@ -239,7 +239,7 @@ FvReadFileSection (
 /**

   Writes one or more files to the firmware volume.

 

-  @param  This                   Indicates the calling context.

+  @param  This                   Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.

   @param  NumberOfFiles          Number of files.

   @param  WritePolicy            WritePolicy indicates the level of reliability

                                  for the write in the event of a power failure or