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

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

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
index 3e9e5364e901df7057b80c652bb7cb6602921db9..ec3f49c5dc3f7a714d088a376eb19471702b316a 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
@@ -264,7 +264,6 @@ Returns:
   UINT32                    TotalTokenNumber;\r
   UINT8                     *Local;\r
   EFI_NARROW_GLYPH          *NarrowGlyph;\r
-  EFI_WIDE_GLYPH            *WideGlyph;\r
 \r
   if (Packages->NumberOfPackages == 0 || This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -439,7 +438,7 @@ Returns:
       // we go down one level deeper, increment the handle value that will be passed back.\r
       //\r
       if (Database->Handle >= *Handle) {\r
-        *Handle = Database->Handle + 1;\r
+        *Handle = (EFI_HII_HANDLE) (Database->Handle + 1);\r
       }\r
     }\r
 \r
@@ -518,7 +517,6 @@ Returns:
         Local = (UINT8 *) (&FontPack->NumberOfWideGlyphs + sizeof (UINT8)) +\r
           (sizeof (EFI_NARROW_GLYPH)) *\r
           NumNarrowGlyphs;\r
-        WideGlyph = (EFI_WIDE_GLYPH *) Local;\r
         CopyMem (\r
           &Member,\r
           (UINTN *) (Local + sizeof (EFI_WIDE_GLYPH) * Count),\r
@@ -530,7 +528,6 @@ Returns:
         CopyMem (&Unicode, &GlobalData->WideGlyphs[Member].UnicodeWeight, sizeof (UINT16));\r
         if (Unicode == 0) {\r
           Local = (UINT8*)(&FontPack->NumberOfWideGlyphs + sizeof(UINT8)) + (sizeof(EFI_NARROW_GLYPH)) * NumNarrowGlyphs;\r
-          WideGlyph = (EFI_WIDE_GLYPH *) Local;\r
           CopyMem (\r
             &GlobalData->WideGlyphs[Member],\r
             (UINTN *) (Local + sizeof (EFI_WIDE_GLYPH) * Count),\r
@@ -619,7 +616,6 @@ Returns:
   EFI_HII_DATA              *HiiData;\r
   EFI_HII_HANDLE_DATABASE   *HandleDatabase;\r
   EFI_HII_HANDLE_DATABASE   *PreviousHandleDatabase;\r
-  UINTN                     Count;\r
 \r
   if (This == NULL || Handle == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -635,7 +631,7 @@ Returns:
   //\r
   PreviousHandleDatabase = HandleDatabase;\r
 \r
-  for (Count = 0; HandleDatabase != NULL; HandleDatabase = HandleDatabase->NextHandleDatabase) {\r
+  for (; HandleDatabase != NULL; HandleDatabase = HandleDatabase->NextHandleDatabase) {\r
     //\r
     // Match the numeric value with the database entry - if matched,\r
     // free the package instance and apply fix-up to database linked list\r