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

[mirror_edk2.git] / EdkModulePkg / Library / EdkIfrSupportLib / IfrCommon.c

diff --git a/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c b/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c
index cff559cf4d41a0df25315cde7ced199be287ad70..b2c906476de3063416002f194265ada25db37fce 100644 (file)
--- a/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c
+++ b/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c
@@ -128,6 +128,8 @@ Returns:
   UINT8               *Destination;\r
   UINTN               Index;\r
   BOOLEAN             Finished;\r
+  UINTN               SizeofLanguage;\r
+  UINTN               SizeofString;\r
 \r
   StringPack  = (EFI_HII_STRING_PACK *) StringBuffer;\r
   Finished    = FALSE;\r
@@ -248,14 +250,16 @@ Returns:
     //\r
     // Pointing to a new string pack location\r
     //\r
+    SizeofLanguage = StrSize (Language);\r
+    SizeofString   = StrSize (String);\r
     StringPackBuffer->Header.Length = (UINT32)\r
       (\r
         sizeof (EFI_HII_STRING_PACK) -\r
         sizeof (EFI_STRING) +\r
         sizeof (RELOFST) +\r
         sizeof (RELOFST) +\r
-        StrSize (Language) +\r
-        StrSize (String)\r
+        SizeofLanguage +\r
+        SizeofString\r
       );\r
     StringPackBuffer->Header.Type           = EFI_HII_STRING;\r
     StringPackBuffer->LanguageNameString    = (UINT16) ((UINTN) &PackDestination[3] - (UINTN) StringPackBuffer);\r
@@ -423,7 +427,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 GetHiiInterface (\r
   OUT     EFI_HII_PROTOCOL    **Hii\r