MdeModulePkg: Remove variables that are set, but not used

GCC 4.6 generates a warning when a variable is set,
but never used.

Signed-off-by: jljusten
Reviewed-by: lgao4
Reviewed-by: erictian
Reviewed-by: rsun3
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12617 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index 6c8d4b2df65b1e7b0574cd041a971e435865595c..0bc54abbf7255512837cf0f71e30cd1f52fe50a4 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -1389,7 +1389,6 @@ AhciReset (
   IN  UINT64                    Timeout\r
   )    \r
 {\r
-  EFI_STATUS             Status;\r
   UINT32                 Delay;\r
   UINT32                 Value;\r
 \r
@@ -1397,8 +1396,6 @@ AhciReset (
 \r
   AhciOrReg (PciIo, EFI_AHCI_GHC_OFFSET, EFI_AHCI_GHC_RESET);\r
 \r
-  Status  = EFI_TIMEOUT;\r
-\r
   Delay = (UINT32) (DivU64x32(Timeout, 1000) + 1);\r
 \r
   do {\r
@@ -2137,8 +2134,6 @@ AhciModeInitialization (
   UINT32                           Capability;\r
   UINT8                            MaxPortNumber;\r
   UINT32                           PortImplementBitMap;\r
-  UINT8                            MaxCommandSlotNumber;\r
-  BOOLEAN                          Support64Bit;\r
 \r
   EFI_AHCI_REGISTERS               *AhciRegisters;\r
 \r
@@ -2178,9 +2173,7 @@ AhciModeInitialization (
   //\r
   // Get the number of command slots per port supported by this HBA.\r
   //\r
-  MaxCommandSlotNumber = (UINT8) (((Capability & 0x1F00) >> 8) + 1);\r
   MaxPortNumber        = (UINT8) ((Capability & 0x1F) + 1);\r
-  Support64Bit         = (BOOLEAN) (((Capability & EFI_AHCI_CAP_S64A) != 0) ? TRUE : FALSE);\r
 \r
   //\r
   // Get the bit map of those ports exposed by this HBA.\r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 526590718aa0e43fe2f2496103c7f6052eaed7ee..72196a00401b650cf42aae7a03be260ab2118ed2 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -658,13 +658,11 @@ AtaAtapiPassThruStart (
   ATA_ATAPI_PASS_THRU_INSTANCE      *Instance;\r
   EFI_PCI_IO_PROTOCOL               *PciIo;\r
   UINT64                            Supports;\r
-  BOOLEAN                           PciAttributesSaved;\r
   UINT64                            OriginalPciAttributes;\r
 \r
   Status                = EFI_SUCCESS;\r
   IdeControllerInit     = NULL;\r
   Instance              = NULL;\r
-  PciAttributesSaved    = FALSE;\r
   OriginalPciAttributes = 0;\r
 \r
   DEBUG ((EFI_D_INFO, "==AtaAtapiPassThru Start== Controller = %x\n", Controller));\r
@@ -706,7 +704,6 @@ AtaAtapiPassThruStart (
   if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
-  PciAttributesSaved = TRUE;\r
 \r
   Status = PciIo->Attributes (\r
                     PciIo,\r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index 17e4d7e13a482c26c0aa5b50f17f332aba5b90ab..79310fcb49a311033550d48d11180dbf5846a0b2 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -1482,7 +1482,6 @@ AtaUdmaInOut (
   EFI_PCI_IO_PROTOCOL_OPERATION PciIoOperation;\r
 \r
   UINT8                         DeviceHead;\r
-  UINT8                         AtaCommand;\r
   EFI_PCI_IO_PROTOCOL           *PciIo;\r
   EFI_TPL                       OldTpl;\r
 \r
@@ -1639,7 +1638,6 @@ AtaUdmaInOut (
     // Start to enable the DMA operation\r
     //\r
     DeviceHead = AtaCommandBlock->AtaDeviceHead;\r
-    AtaCommand = AtaCommandBlock->AtaCommand;\r
 \r
     IdeWritePortB (PciIo, IdeRegisters->Head, (UINT8)(0xe0 | DeviceHead));\r
 \r
@@ -2797,7 +2795,6 @@ IdeModeInitialization (
   IN  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance\r
   )\r
 {\r
-  BOOLEAN                           EnumAll;\r
   EFI_STATUS                        Status;\r
   EFI_IDE_CONTROLLER_INIT_PROTOCOL  *IdeInit;\r
   EFI_PCI_IO_PROTOCOL               *PciIo;\r
@@ -2808,7 +2805,6 @@ IdeModeInitialization (
 \r
   IdeInit = Instance->IdeControllerInit;\r
   PciIo   = Instance->PciIo;\r
-  EnumAll = IdeInit->EnumAll;\r
   Channel = IdeInit->ChannelCount;\r
 \r
   //\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
index d153aa39dc9d080fc2b805f0c521b77bfb1eccad..8e9dad12d2adef1401ee98d6f60de7db8d25b86a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
@@ -2,7 +2,7 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
   \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -264,7 +264,6 @@ EhcUnlinkQhFromAsync (
   )\r
 {\r
   PEI_EHC_QH              *Head;\r
-  EFI_STATUS              Status;\r
 \r
   ASSERT (Ehc->ReclaimHead->NextQh == Qh);\r
 \r
@@ -283,7 +282,7 @@ EhcUnlinkQhFromAsync (
   //\r
   // Set and wait the door bell to synchronize with the hardware\r
   //\r
-  Status = EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);\r
+  EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);\r
   \r
   return;\r
 }\r
@@ -804,8 +803,7 @@ EhcMoniteAsyncRequests (
   BOOLEAN                 Finished;\r
   UINT8                   *ProcBuf;\r
   PEI_URB                 *Urb;\r
-  EFI_STATUS              Status;\r
-  UINTN               PageNumber;\r
+  UINTN                   PageNumber;\r
 \r
   Ehc     = (PEI_USB2_HC_DEV *) Context;\r
 \r
@@ -826,7 +824,7 @@ EhcMoniteAsyncRequests (
     // Flush any PCI posted write transactions from a PCI host \r
     // bridge to system memory.\r
     //\r
-    Status = EhcFlushAsyncIntMap (Ehc, Urb);\r
+    EhcFlushAsyncIntMap (Ehc, Urb);\r
     \r
     //\r
     // Allocate a buffer then copy the transferred data for user.\r
@@ -838,11 +836,11 @@ EhcMoniteAsyncRequests (
     if (Urb->Result == EFI_USB_NOERROR) {\r
       ASSERT (Urb->Completed <= Urb->DataLen);\r
       PageNumber =  Urb->Completed/PAGESIZE +1;\r
-      Status = PeiServicesAllocatePages (\r
-                 EfiBootServicesCode,\r
-                 PageNumber,\r
-                 (EFI_PHYSICAL_ADDRESS *)ProcBuf\r
-                 );\r
+      PeiServicesAllocatePages (\r
+        EfiBootServicesCode,\r
+        PageNumber,\r
+        (EFI_PHYSICAL_ADDRESS *)ProcBuf\r
+        );\r
       if (ProcBuf == NULL) {\r
         EhcUpdateAsyncRequest (Urb);\r
         continue;\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index bbde0ca0b775a5fbcf52a1ab300aed464a77ceb7..5ccb78e55b05bb17cf3bccb2f14c126f3091b5d1 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -973,16 +973,16 @@ XhcControlTransfer (
       //\r
       // For super speed hub, its bit10~12 presents the attached device speed.\r
       //\r
-      if ((*(UINT32 *)Data & XHC_PORTSC_PS) >> 10 == 0) {\r
+      if ((State & XHC_PORTSC_PS) >> 10 == 0) {\r
         PortStatus.PortStatus |= USB_PORT_STAT_SUPER_SPEED;\r
       }\r
     } else if (DeviceSpeed == EFI_USB_SPEED_HIGH) {\r
       //\r
       // For high speed hub, its bit9~10 presents the attached device speed.\r
       //\r
-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, BIT9)) {\r
+      if (XHC_BIT_IS_SET (State, BIT9)) {\r
         PortStatus.PortStatus |= USB_PORT_STAT_LOW_SPEED;\r
-      } else if (XHC_BIT_IS_SET (*(UINT32 *)Data, BIT10)) {\r
+      } else if (XHC_BIT_IS_SET (State, BIT10)) {\r
         PortStatus.PortStatus |= USB_PORT_STAT_HIGH_SPEED;\r
       }\r
     } else {\r
@@ -994,14 +994,14 @@ XhcControlTransfer (
     //\r
     MapSize = sizeof (mUsbPortStateMap) / sizeof (USB_PORT_STATE_MAP);\r
     for (Index = 0; Index < MapSize; Index++) {\r
-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, mUsbPortStateMap[Index].HwState)) {\r
+      if (XHC_BIT_IS_SET (State, mUsbPortStateMap[Index].HwState)) {\r
         PortStatus.PortStatus = (UINT16) (PortStatus.PortStatus | mUsbPortStateMap[Index].UefiState);\r
       }\r
     }\r
     MapSize = sizeof (mUsbPortChangeMap) / sizeof (USB_PORT_STATE_MAP);\r
 \r
     for (Index = 0; Index < MapSize; Index++) {\r
-      if (XHC_BIT_IS_SET (*(UINT32 *)Data, mUsbPortChangeMap[Index].HwState)) {\r
+      if (XHC_BIT_IS_SET (State, mUsbPortChangeMap[Index].HwState)) {\r
       PortStatus.PortChangeStatus = (UINT16) (PortStatus.PortChangeStatus | mUsbPortChangeMap[Index].UefiState);\r
       }\r
     }\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 6745d2f81a23823cd38f5a0c762ae294cf6c3984..49cc2619eb4dbd9f986d853080009281fa1e5219 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -181,6 +181,7 @@ XhcCreateUrb (
   Urb->Context  = Context;\r
 \r
   Status = XhcCreateTransferTrb (Xhc, Urb);\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   return Urb;\r
 }\r
@@ -740,13 +741,11 @@ XhcFreeEventRing (
   EVENT_RING_SEG_TABLE_ENTRY    *TablePtr;\r
   VOID                          *RingBuf;\r
   EVENT_RING_SEG_TABLE_ENTRY    *EventRingPtr;\r
-  UINTN                         InterrupterTarget;\r
 \r
   if(EventRing->EventRingSeg0 == NULL) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  InterrupterTarget = EventRing->EventInterrupter;\r
   //\r
   // Get the Event Ring Segment Table base address\r
   //\r
@@ -1048,12 +1047,10 @@ XhciDelAsyncIntTransfer (
   LIST_ENTRY              *Next;\r
   URB                     *Urb;\r
   EFI_USB_DATA_DIRECTION  Direction;\r
-  BOOLEAN                 Found;\r
 \r
   Direction = ((EpNum & 0x80) != 0) ? EfiUsbDataIn : EfiUsbDataOut;\r
   EpNum    &= 0x0F;\r
 \r
-  Found = FALSE;\r
   Urb   = NULL;\r
 \r
   EFI_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) {\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index e830517dd9f95864ee1e45ea8ac2f6eea2851d4e..e3ff281643f02cbd306c85874e971b6ec49d93bf 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -534,10 +534,8 @@ UsbBootGetParams (
 {\r
   EFI_BLOCK_IO_MEDIA          *Media;\r
   EFI_STATUS                  Status;\r
-  UINT8                       CmdSet;\r
 \r
   Media  = &(UsbMass->BlockIoMedia);\r
-  CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;\r
 \r
   Status = UsbBootInquiry (UsbMass);\r
   if (EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index ffeab4e391a4dea53b9ac80101b03a55138cd51e..0392cfe1e852177da635ed5c0ad839c331fc5599 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -265,8 +265,6 @@ PeiLoadFixAddressHook(
   EFI_PEI_HOB_POINTERS               CurrentHob;\r
   EFI_PEI_HOB_POINTERS               Hob;\r
   EFI_PEI_HOB_POINTERS               NextHob;\r
-  EFI_PHYSICAL_ADDRESS               MaxMemoryBaseAddress;\r
-  UINT64                             MaxMemoryLength;\r
   EFI_HOB_MEMORY_ALLOCATION          *MemoryHob;\r
   //\r
   // Initialize Local Variables\r
@@ -274,8 +272,6 @@ PeiLoadFixAddressHook(
   CurrentResourceHob    = NULL;\r
   ResourceHob           = NULL;\r
   NextResourceHob       = NULL;\r
-  MaxMemoryBaseAddress  = 0;\r
-  MaxMemoryLength       = 0;\r
   HighAddress           = 0;\r
   TopLoadingAddress     = 0;\r
   MemoryRangeEnd      = 0;\r

diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index 671c3332f91e07e73d4df1378f9eb0541e94c21d..3b4d4e03adb26c5c105d5158229dd8f74daab088 100644 (file)
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
@@ -1134,7 +1134,6 @@ InternalPrintLibSPrintMarker (
   IN  BASE_LIST    BaseListMarker  OPTIONAL\r
   )\r
 {\r
-  CHAR8             *OriginalBuffer;\r
   CHAR8             *EndBuffer;\r
   CHAR8             ValueBuffer[MAXIMUM_VALUE_CHARACTERS];\r
   UINT32            BytesPerOutputCharacter;\r
@@ -1185,7 +1184,6 @@ InternalPrintLibSPrintMarker (
   // Reserve space for the Null terminator.\r
   //\r
   BufferSize--;\r
-  OriginalBuffer = Buffer;\r
 \r
   //\r
   // Set the tag for the end of the input Buffer.\r

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index a87441e2c0ed491a428237aee4f7c46614a04b69..7a2415e9e5e65e60d3ff3533a0208a7e62e8bf54 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1630,12 +1630,11 @@ InternalHiiIfrValueAction (
   EFI_GUID       *VarGuid;\r
   EFI_STRING     VarName;\r
 \r
-  UINT8                        *PackageData;\r
   EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;\r
   UINTN                        PackageListLength;\r
   EFI_DEVICE_PATH_PROTOCOL     *DevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL     *TempDevicePath;\r
-  \r
+\r
   ConfigAltResp = NULL;\r
   ConfigResp    = NULL;\r
   VarGuid       = NULL;\r
@@ -1646,7 +1645,6 @@ InternalHiiIfrValueAction (
   Index            = 0;\r
   TempDriverHandle = NULL;\r
   HiiHandle        = NULL;\r
-  PackageData      = NULL;\r
   HiiPackageList   = NULL;\r
   \r
   //\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
index fe2c7613e54a48d6d4884c039e22695735f8220f..9f47b48835852fd1cb337de958e820e03bbcccdd 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
-  Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -117,9 +117,7 @@ AmlGetNameStringSize (
   UINTN                 SegCount;\r
   UINTN                 Length;\r
   UINTN                 Index;\r
-  UINT8                 *Name;\r
 \r
-  Name = Buffer;\r
   Length = 0;\r
 \r
   //\r
@@ -493,9 +491,7 @@ AmlPrintNameString (
 {\r
   UINT8                 SegCount;\r
   UINT8                 Index;\r
-  UINT8                 *Name;\r
- \r
-  Name = Buffer;\r
+\r
   if (*Buffer == AML_ROOT_CHAR) {\r
     //\r
     // RootChar\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index b6621a93e275033a0c21edc50d306bd52537e80a..37a592ce9027bbb95f332a448dd850d16e7adaf0 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -662,7 +662,6 @@ AppendAltCfgString (
   )\r
 {\r
   EFI_STRING                          StringPtr;\r
-  EFI_STRING                          TmpPtr;\r
   UINTN                               Length;\r
   UINT8                               *TmpBuffer;\r
   UINTN                               Offset;\r
@@ -683,11 +682,6 @@ AppendAltCfgString (
   }\r
 \r
   while (*StringPtr != 0 && StrnCmp (StringPtr, L"OFFSET=", StrLen (L"OFFSET=")) == 0) {\r
-    //\r
-    // Back up the header of one <BlockName>\r
-    //\r
-    TmpPtr = StringPtr;\r
-\r
     StringPtr += StrLen (L"OFFSET=");\r
     //\r
     // Get Offset\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
index 023733b8d5715d2c1f181b1a933ff746699b1da5..6a925732758cf66b76670e22faa1b16a4e099931 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
@@ -1,7 +1,7 @@
 /** @file\r
   IP4 option support functions.\r
   \r
-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,8 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Validate the IP4 option format for both the packets we received\r
-  and will transmit. It will compute the ICMP error message fields\r
-  if the option is mal-formated. But this information isn't used.\r
+  and will transmit.\r
 \r
   @param[in]  Option            The first byte of the option\r
   @param[in]  OptionLen         The length of the whole option\r
@@ -39,13 +38,6 @@ Ip4OptionIsValid (
   UINT32                    Cur;\r
   UINT32                    Len;\r
   UINT32                    Point;\r
-  volatile UINT8            IcmpType;\r
-  volatile UINT8            IcmpCode;\r
-  volatile UINT32           IcmpPoint;\r
-\r
-  IcmpType  = ICMP_PARAMETER_PROBLEM;\r
-  IcmpCode  = 0;\r
-  IcmpPoint = 0;\r
 \r
   Cur       = 0;\r
 \r
@@ -69,12 +61,10 @@ Ip4OptionIsValid (
       // SRR/RR options are formatted as |Type|Len|Point|Ip1|Ip2|...\r
       //\r
       if ((OptionLen - Cur < Len) || (Len < 3) || ((Len - 3) % 4 != 0)) {\r
-        IcmpPoint = Cur + 1;\r
         return FALSE;\r
       }\r
 \r
       if ((Point > Len + 1) || (Point % 4 != 0)) {\r
-        IcmpPoint = Cur + 2;\r
         return FALSE;\r
       }\r
 \r
@@ -86,8 +76,6 @@ Ip4OptionIsValid (
       if ((Option[Cur] != IP4_OPTION_RR) &&\r
           ((Rcvd && (Point != Len + 1)) || (!Rcvd && (Point != 4)))) {\r
 \r
-        IcmpType  = ICMP_DEST_UNREACHABLE;\r
-        IcmpCode  = ICMP_SOURCEROUTE_FAILED;\r
         return FALSE;\r
       }\r
 \r
@@ -98,7 +86,6 @@ Ip4OptionIsValid (
       Len = Option[Cur + 1];\r
 \r
       if ((OptionLen - Cur < Len) || (Len < 2)) {\r
-        IcmpPoint = Cur + 1;\r
         return FALSE;\r
       }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index b58a00a5444d42374ef06c7772ce7b7e8cee278a..80e3a71edd6c2fc995f33cabe74a0843e662bd3f 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1005,7 +1005,6 @@ FindNextMenu (
   CHAR16                  YesResponse;\r
   CHAR16                  NoResponse;\r
   EFI_INPUT_KEY           Key;\r
-  EFI_STATUS              Status;\r
   BROWSER_SETTING_SCOPE   Scope;\r
   \r
   CurrentMenu = Selection->CurrentMenu;\r
@@ -1032,7 +1031,7 @@ FindNextMenu (
     //\r
     if ((gBrowserSettingScope == FormLevel && Selection->Form->NvUpdateRequired) ||\r
         (gBrowserSettingScope == FormSetLevel && IsNvUpdateRequired(Selection->FormSet) && Scope == FormSetLevel)) {\r
-      Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+      gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
   \r
       YesResponse = gYesResponse[0];\r
       NoResponse  = gNoResponse[0];\r
@@ -1068,12 +1067,12 @@ FindNextMenu (
         //\r
         // If the user hits the YesResponse key\r
         //\r
-        Status = SubmitForm (Selection->FormSet, Selection->Form, Scope);\r
+        SubmitForm (Selection->FormSet, Selection->Form, Scope);\r
       } else {\r
         //\r
         // If the user hits the NoResponse key\r
         //\r
-        Status = DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
+        DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
       }\r
     }\r
 \r
@@ -1101,7 +1100,7 @@ FindNextMenu (
   // We are going to leave current FormSet, so check uncommited data in this FormSet\r
   //\r
   if (gBrowserSettingScope != SystemLevel && IsNvUpdateRequired(Selection->FormSet)) {\r
-    Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+    gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
 \r
     YesResponse = gYesResponse[0];\r
     NoResponse  = gNoResponse[0];\r
@@ -1138,12 +1137,12 @@ FindNextMenu (
       //\r
       // If the user hits the YesResponse key\r
       //\r
-      Status = SubmitForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
+      SubmitForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
     } else {\r
       //\r
       // If the user hits the NoResponse key\r
       //\r
-      Status = DiscardForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
+      DiscardForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
     }\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index a1e6f81ecbf22c4b365a35cbcd813f4b39f41356..00462a270fde4f13bec19611a7dfbfbbebf7e43b 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -4128,7 +4128,6 @@ SaveReminder (
   CHAR16                  *ChangeReminderString;\r
   CHAR16                  *SaveConfirmString;\r
   EFI_INPUT_KEY           Key;\r
-  EFI_STATUS              Status;\r
 \r
   DataSavedAction  = BROWSER_NO_CHANGES;\r
   IsDataChanged    = FALSE;\r
@@ -4152,7 +4151,7 @@ SaveReminder (
   //\r
   // If data is changed, prompt user\r
   //\r
-  Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+  gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
 \r
   YesResponse          = GetToken (STRING_TOKEN (ARE_YOU_SURE_YES), gHiiHandle);\r
   ASSERT (YesResponse != NULL);\r