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

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index c236282d46b7203895d5e415f8c65855f7e7203c..16d66fa0d4dc807be0ceded0df16bf7d469d777d 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -83,6 +83,9 @@ GetFwVolHeader (
   //\r
   FvhLength = sizeof (EFI_FIRMWARE_VOLUME_HEADER);\r
   Status = Fvb->Read (Fvb, 0, 0, &FvhLength, (UINT8 *)&TempFvh);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
 \r
   //\r
   // Allocate a buffer for the caller\r
@@ -494,9 +497,9 @@ NotifyFwVolBlock (
 \r
 \r
 /**\r
-  This routine is the driver initialization entry point.  It initializes the\r
-  libraries, and registers two notification functions.  These notification\r
-  functions are responsible for building the FV stack dynamically.\r
+  This routine is the driver initialization entry point.  It registers\r
+  a notification function.  This notification function are responsible\r
+  for building the FV stack dynamically.\r
 \r
   @param  ImageHandle           The image handle.\r
   @param  SystemTable           The system table.\r

diff --git a/MdeModulePkg/Core/Dxe/FwVolDriver.h b/MdeModulePkg/Core/Dxe/FwVolDriver.h
index 6c2f1b9d8ab151664536f6e156553e5a1b0c8f23..5acbacc7c7c15f5b4493bc990bb127684e52ce8b 100644 (file)
--- 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\r
   resulting attributes in output parameter.\r
 \r
-  @param  This             Calling context\r
-  @param  Attributes       output buffer which contains attributes\r
+  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
+  @param  Attributes       output buffer which contains attributes.\r
 \r
-  @retval EFI_SUCCESS      Successfully got volume attributes\r
+  @retval EFI_SUCCESS      Successfully got volume attributes.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -68,9 +68,9 @@ FvGetVolumeAttributes (
 /**\r
   Sets current attributes for volume\r
 \r
-  @param  This             Calling context\r
+  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
   @param  Attributes       At input, contains attributes to be set.  At output\r
-                           contains new value of FV\r
+                           contains new value of FV.\r
 \r
   @retval EFI_UNSUPPORTED  Could not be set.\r
 \r
@@ -86,7 +86,7 @@ FvSetVolumeAttributes (
 /**\r
   Given the input key, search for the next matching file in the volume.\r
 \r
-  @param  This                       Indicates the calling context.\r
+  @param  This                       Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
   @param  Key                        Key is a pointer to a caller allocated\r
                                      buffer that contains implementation specific\r
                                      data that is used to track where to begin\r
@@ -146,7 +146,7 @@ FvGetNextFile (
   Locates a file in the firmware volume and\r
   copies it to the supplied buffer.\r
 \r
-  @param  This                       Indicates the calling context.\r
+  @param  This                       Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
   @param  NameGuid                   Pointer to an EFI_GUID, which is the\r
                                      filename.\r
   @param  Buffer                     Buffer is a pointer to pointer to a buffer\r
@@ -199,7 +199,7 @@ FvReadFile (
   Locates a section in a given FFS File and\r
   copies it to the supplied buffer (not including section header).\r
 \r
-  @param  This                       Indicates the calling context.\r
+  @param  This                       Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
   @param  NameGuid                   Pointer to an EFI_GUID, which is the\r
                                      filename.\r
   @param  SectionType                Indicates the section type to return.\r
@@ -239,7 +239,7 @@ FvReadFileSection (
 /**\r
   Writes one or more files to the firmware volume.\r
 \r
-  @param  This                   Indicates the calling context.\r
+  @param  This                   Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
   @param  NumberOfFiles          Number of files.\r
   @param  WritePolicy            WritePolicy indicates the level of reliability\r
                                  for the write in the event of a power failure or\r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
index 2a84da4d971e01c71fa9670d60e1dfad61908405..d37821963cad716d5b2266f502783308b30e6b11 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "LibraryInternal.h"\r
 \r
+extern EFI_HII_DATABASE_PROTOCOL *gIfrLibHiiDatabase;\r
+\r
 /**\r
   Get the specified package from a package list based on an index.\r
   The Buffer on output is updated to point to a package header in\r