EmulatorPkg: Remove variables that are set, but not used

GCC 4.6 flags a warning for this.

Signed-off-by: jljusten
Reviewed-by: andrewfish

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12613 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 10 insertions, 34 deletions

diff --git a/EmulatorPkg/CpuRuntimeDxe/Cpu.c b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
index 2f7d5368e0..10d86f8e9c 100644
--- a/EmulatorPkg/CpuRuntimeDxe/Cpu.c
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
@@ -127,9 +127,6 @@ EmuInit (
   IN EFI_CPU_INIT_TYPE      InitType

   )

 {

-  CPU_ARCH_PROTOCOL_PRIVATE *Private;

-

-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);

   return EFI_UNSUPPORTED;

 }

 

@@ -141,8 +138,6 @@ EmuRegisterInterruptHandler (
   IN EFI_CPU_INTERRUPT_HANDLER  InterruptHandler

   )

 {

-  CPU_ARCH_PROTOCOL_PRIVATE *Private;

-

   //

   // Do parameter checking for EFI spec conformance

   //

@@ -152,7 +147,6 @@ EmuRegisterInterruptHandler (
   //

   // Do nothing for Emu emulation

   //

-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);

   return EFI_UNSUPPORTED;

 }

 

@@ -192,8 +186,6 @@ EmuSetMemoryAttributes (
   IN UINT64                 Attributes

   )

 {

-  CPU_ARCH_PROTOCOL_PRIVATE *Private;

-

   //

   // Check for invalid parameter for Spec conformance

   //

@@ -204,7 +196,6 @@ EmuSetMemoryAttributes (
   //

   // Do nothing for Nt32 emulation

   //

-  Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);

   return EFI_UNSUPPORTED;

 }

 

diff --git a/EmulatorPkg/CpuRuntimeDxe/MpService.c b/EmulatorPkg/CpuRuntimeDxe/MpService.c
index b5b1d156c0..ba0ad82504 100644
--- a/EmulatorPkg/CpuRuntimeDxe/MpService.c
+++ b/EmulatorPkg/CpuRuntimeDxe/MpService.c
@@ -374,7 +374,6 @@ CpuMpServicesStartupAllAps (
 {

   EFI_STATUS            Status;

   PROCESSOR_DATA_BLOCK  *ProcessorData;

-  UINTN                 ListIndex;

   UINTN                 Number;

   UINTN                 NextNumber;

   PROCESSOR_STATE       APInitialState;

@@ -411,7 +410,6 @@ CpuMpServicesStartupAllAps (
 

   Timeout = TimeoutInMicroseconds;

 

-  ListIndex                   = 0;

   ProcessorData               = NULL;

 

   gMPSystem.FinishCount   = 0;

@@ -650,7 +648,6 @@ CpuMpServicesStartupThisAP (
   OUT BOOLEAN                   *Finished               OPTIONAL

   )

 {

-  EFI_STATUS      Status;

   INTN            Timeout;

 

   if (!IsBSP ()) {

@@ -685,13 +682,13 @@ CpuMpServicesStartupThisAP (
   SetApProcedure (&gMPSystem.ProcessorData[ProcessorNumber], Procedure, ProcedureArgument);

 

   if (WaitEvent != NULL) {

-      // Non Blocking

-      gMPSystem.WaitEvent = WaitEvent;

-      Status = gBS->SetTimer (

-                      gMPSystem.ProcessorData[ProcessorNumber].CheckThisAPEvent,

-                      TimerPeriodic,

-                      gPollInterval

-                      );

+    // Non Blocking

+    gMPSystem.WaitEvent = WaitEvent;

+    gBS->SetTimer (

+           gMPSystem.ProcessorData[ProcessorNumber].CheckThisAPEvent,

+           TimerPeriodic,

+           gPollInterval

+           );

     return EFI_SUCCESS;

   }

 

@@ -1155,10 +1152,6 @@ FillInProcessorInformation (
   IN     UINTN                ProcessorNumber

   )

 {

-  PROCESSOR_DATA_BLOCK            *ProcessorData;

-

-  ProcessorData = &gMPSystem.ProcessorData[ProcessorNumber];

-

   gMPSystem.ProcessorData[ProcessorNumber].Info.ProcessorId  = gThread->Self ();

   gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag   = PROCESSOR_ENABLED_BIT | PROCESSOR_HEALTH_STATUS_BIT;

   if (BSP) {

diff --git a/EmulatorPkg/EmuGopDxe/GopInput.c b/EmulatorPkg/EmuGopDxe/GopInput.c
index 288a151d6d..a1f636aaa2 100644
--- a/EmulatorPkg/EmuGopDxe/GopInput.c
+++ b/EmulatorPkg/EmuGopDxe/GopInput.c
@@ -300,10 +300,6 @@ EmuGopSimpleTextInExResetEx (
 
 **/
 {
-  GOP_PRIVATE_DATA *Private;
-
-  Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_EX_THIS (This);
-
   return EFI_SUCCESS;
 }
 
diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
index fff07d57fd..34ee6a5d52 100644
--- a/EmulatorPkg/EmuGopDxe/GopScreen.c
+++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
@@ -1,6 +1,6 @@
 /*++ @file
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -368,11 +368,8 @@ EmuGopDestructor (
   GOP_PRIVATE_DATA     *Private
   )
 {
-  EFI_STATUS  Status;
-
-  Status = EFI_SUCCESS;
   if (!Private->HardwareNeedsStarting) {
-    Status = Private->EmuIoThunk->Close (Private->EmuIoThunk);
+    Private->EmuIoThunk->Close (Private->EmuIoThunk);
     Private->EmuGraphicsWindow = NULL;
   }
 
@@ -414,7 +411,6 @@ Returns:
 
 **/
 {
-  EFI_STATUS  Status;
-  Status = EmuGopDestructor (Context);
+  EmuGopDestructor (Context);
 }