Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Universal / UserInterface / HiiDataBase / Dxe / Forms.c

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
index 4178284a494017b285de7924370d9f8739bf9c51..0c8629c06fe290ef15706d6f1e9267ee268b8df5 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
@@ -22,6 +22,7 @@ Abstract:
 \r
 #include "HiiDatabase.h"\r
 \r
+STATIC\r
 CHAR16*\r
 Ascii2Unicode (\r
   OUT CHAR16         *UnicodeStr,\r
@@ -54,6 +55,7 @@ Ascii2Unicode (
   }\r
 }\r
 \r
+STATIC\r
 CHAR8*\r
 Unicode2Ascii (\r
   OUT CHAR8          *AsciiStr,\r
@@ -86,6 +88,7 @@ Unicode2Ascii (
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 ExtractDevicePathData (\r
   IN     EFI_HII_DATA_TABLE   *DataTable,\r
@@ -129,6 +132,7 @@ Returns:
   *ExportBufferPtr  = ExportBuffer;\r
 }\r
 \r
+STATIC\r
 VOID\r
 ExtractVariableData (\r
   IN OUT EFI_HII_DATA_TABLE   *DataTable,\r
@@ -205,6 +209,7 @@ Returns:
                         &gEfiFormCallbackProtocolGuid,\r
                         (VOID *) &FormCallback\r
                         );\r
+        ASSERT_EFI_ERROR (Status);\r
       }\r
       //\r
       // Since we have a "Setup" variable that wasn't specified by a variable op-code\r
@@ -240,6 +245,7 @@ Returns:
                                  &TempValue,\r
                                  ExportBuffer\r
                                  );\r
+        ASSERT_EFI_ERROR (Status);\r
       } else {\r
         Status = gRT->GetVariable (\r
                         (CHAR16 *) SETUP_MAP_NAME,\r
@@ -248,6 +254,7 @@ Returns:
                         &TempValue,\r
                         ExportBuffer\r
                         );\r
+        ASSERT_EFI_ERROR (Status);\r
       }\r
 \r
       ExportBuffer = (UINT8 *) (UINTN) (((UINTN) ExportBuffer) + TempValue);\r
@@ -306,6 +313,7 @@ Returns:
                                  &TempValue,\r
                                  ExportBuffer\r
                                  );\r
+        ASSERT_EFI_ERROR (Status);\r
       } else {\r
         Status = gRT->GetVariable (\r
                         String,\r
@@ -314,6 +322,7 @@ Returns:
                         &TempValue,\r
                         ExportBuffer\r
                         );\r
+        ASSERT_EFI_ERROR (Status);\r
       }\r
 \r
       ExportBuffer = (UINT8 *) (UINTN) (((UINTN) ExportBuffer) + TempValue);\r
@@ -367,7 +376,6 @@ Returns:
   UINT8                     *ExportBuffer;\r
   EFI_HII_EXPORT_TABLE      *ExportTable;\r
   EFI_HII_DATA_TABLE        *DataTable;\r
-  BOOLEAN                   InsufficientSize;\r
   BOOLEAN                   VariableExist;\r
   UINT16                    NumberOfHiiDataTables;\r
   UINTN                     SizeNeeded;\r
@@ -386,7 +394,6 @@ Returns:
   FormPack              = NULL;\r
   RawData               = NULL;\r
   PackageInstance       = NULL;\r
-  InsufficientSize      = FALSE;\r
   NumberOfHiiDataTables = 0;\r
   VariableSize          = 0;\r
   TempValue             = 0;\r