ShellPkg: Fixed build error 'variable set but not used'

GCC toolchain cannot build ShellPkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Harry Liebel <Harry.Liebel@arm.com>
Signed-off-by: Olivier Martin <Olivier.Martin@arm.com>
Reviewed-by: Jaben Carsey <Jaben.Carsey@intel.com>

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

10 files changed, 2 insertions, 69 deletions

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
index 095a9460e6..c26fad7b38 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
@@ -293,7 +293,7 @@ BcfgAddDebug1(
   EFI_STATUS                Status;

   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;

   EFI_DEVICE_PATH_PROTOCOL  *FilePath;

-  EFI_DEVICE_PATH_PROTOCOL  *FileNode;

+  /* EFI_DEVICE_PATH_PROTOCOL  *FileNode; */

   CHAR16                    *Str;

   UINT8                     *TempByteBuffer;

   UINT8                     *TempByteStart;

@@ -328,7 +328,7 @@ BcfgAddDebug1(
 

   Str             = NULL;

   FilePath        = NULL;

-  FileNode        = NULL;

+  /* FileNode        = NULL; */

   FileList        = NULL;

   Handles         = NULL;

   ShellStatus     = SHELL_SUCCESS;

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
index 978ce7f13a..649ed57955 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
@@ -133,8 +133,6 @@ InputBarRefresh (
   UINTN                   Size;

   EFI_STATUS              Status;

   BOOLEAN                 NoDisplay;

-  UINTN                   Limit;

-  UINTN                   mPromptLen;

   UINTN                   EventIndex;

   UINTN                   CursorRow;

   UINTN                   CursorCol;

@@ -165,12 +163,6 @@ InputBarRefresh (
   ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gShellDebug1HiiHandle, mPrompt);

 

   //

-  // that's the maximum input length that can be displayed on screen

-  //

-  mPromptLen = StrLen (mPrompt);

-  Limit     = LastColumn - mPromptLen;

-

-  //

   // this is a selection mPrompt, cursor will stay in edit area

   // actually this is for search , search/replace

   //

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index 46926320a6..bfedf58d78 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -752,7 +752,6 @@ HBufferImageRefresh (
   UINTN                   StartRow;

   UINTN                   EndRow;

   UINTN                   FStartRow;

-  UINTN                   FEndRow;

   UINTN                   Tmp;

 

   Orig                  = HMainEditor.ColorAttributes;

@@ -821,7 +820,6 @@ HBufferImageRefresh (
       }

 

       FStartRow = StartRow;

-      FEndRow   = EndRow;

 

       StartRow  = 2 + StartRow - HBufferImage.LowVisibleRow;

       EndRow    = 2 + EndRow - HBufferImage.LowVisibleRow;

@@ -1750,14 +1748,11 @@ HBufferImagePageUp (
   VOID

   )

 {

-  HEFI_EDITOR_LINE  *Line;

   UINTN             FRow;

   UINTN             FCol;

   UINTN             Gap;

   INTN              Retreat;

 

-  Line  = HBufferImage.CurrentLine;

-

   FRow  = HBufferImage.BufferPosition.Row;

   FCol  = HBufferImage.BufferPosition.Column;

 

@@ -1776,11 +1771,6 @@ HBufferImagePageUp (
   Retreat = Gap;

   Retreat = -Retreat;

 

-  //

-  // get correct line

-  //

-  Line = HMoveLine (Retreat);

-

   FRow -= Gap;

 

   HBufferImageMovePosition (FRow, FCol, HBufferImage.HighBits);

@@ -1798,13 +1788,10 @@ HBufferImageHome (
   VOID

   )

 {

-  HEFI_EDITOR_LINE  *Line;

   UINTN             FRow;

   UINTN             FCol;

   BOOLEAN           HighBits;

 

-  Line = HBufferImage.CurrentLine;

-

   //

   // curosr will at the high bit

   //

@@ -1918,7 +1905,6 @@ HBufferImageDeleteCharacterFromBuffer (
 

   HEFI_EDITOR_LINE  *Line;

   LIST_ENTRY    *Link;

-  UINTN             StartRow;

 

   UINTN             OldFCol;

   UINTN             OldFRow;

@@ -1928,11 +1914,6 @@ HBufferImageDeleteCharacterFromBuffer (
 

   EFI_STATUS        Status;

 

-  //

-  // get the line that start position is at

-  //

-  StartRow  = Pos / 0x10;

-

   Size      = HBufferImageGetTotalSize ();

 

   if (Size < Count) {

@@ -2054,7 +2035,6 @@ HBufferImageAddCharacterToBuffer (
   HEFI_EDITOR_LINE  *Line;

 

   LIST_ENTRY    *Link;

-  UINTN             StartRow;

 

   UINTN             OldFCol;

   UINTN             OldFRow;

@@ -2062,11 +2042,6 @@ HBufferImageAddCharacterToBuffer (
 

   UINTN             NewPos;

 

-  //

-  // get the line that start position is at

-  //

-  StartRow  = Pos / 0x10;

-

   Size      = HBufferImageGetTotalSize ();

 

   //

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
index c956f77b28..a50b52f5f2 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
@@ -181,11 +181,7 @@ HDiskImageRead (
   UINTN                           Bytes;

 

   HEFI_EDITOR_LINE                *Line;

-  UINT64                          ByteOffset;

 

-  EDIT_FILE_TYPE                  BufferTypeBackup;

-

-  BufferTypeBackup        = HBufferImage.BufferType;

   HBufferImage.BufferType = FileTypeDiskBuffer;

 

   DevicePath              = gEfiShellProtocol->GetDevicePathFromMap(DeviceName);

@@ -226,8 +222,6 @@ HDiskImageRead (
     return EFI_OUT_OF_RESOURCES;

   }

 

-  ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);

-

   //

   // read from disk

   //

@@ -355,10 +349,6 @@ HDiskImageSave (
   VOID                            *Buffer;

   UINTN                           Bytes;

 

-  UINT64                          ByteOffset;

-

-  EDIT_FILE_TYPE                  BufferTypeBackup;

-

   //

   // if not modified, directly return

   //

@@ -366,7 +356,6 @@ HDiskImageSave (
     return EFI_SUCCESS;

   }

 

-  BufferTypeBackup        = HBufferImage.BufferType;

   HBufferImage.BufferType = FileTypeDiskBuffer;

 

   DevicePath              = gEfiShellProtocol->GetDevicePathFromMap(DeviceName);

@@ -406,8 +395,6 @@ HDiskImageSave (
     return Status;

   }

 

-  ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);

-

   //

   // write the buffer to disk

   //

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
index 68074d4244..8cbfd2c8f6 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
@@ -43,25 +43,19 @@ ShellCommandRunHexEdit (
   CHAR16                  *ProblemParam;

   SHELL_STATUS            ShellStatus;

   LIST_ENTRY              *Package;

-  CONST CHAR16            *Cwd;

   CHAR16                  *NewName;

-  CHAR16                  *Spot;

   CONST CHAR16            *Name;

   UINTN                   Offset;

   UINTN                   Size;

-  UINT64                  LastOffset;

   EDIT_FILE_TYPE          WhatToDo;

 

   Buffer      = NULL;

   ShellStatus = SHELL_SUCCESS;

   NewName         = NULL;

-  Cwd         = NULL;

   Buffer      = NULL;

   Name        = NULL;

-  Spot        = NULL;

   Offset      = 0;

   Size        = 0;

-  LastOffset  = 0;

   WhatToDo    = FileTypeNone;

 

   //

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index 09213d897d..a40388ff40 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -598,7 +598,6 @@ HMainCommandCut (
   )

 {

   UINTN             Index;

-  HEFI_EDITOR_LINE  *Line;

   LIST_ENTRY    *Link;

   UINT8             *Buffer;

   UINTN             Count;

@@ -623,8 +622,6 @@ HMainCommandCut (
     Link = Link->ForwardLink;

   }

 

-  Line    = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST);

-

   Count   = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;

   Buffer  = AllocateZeroPool (Count);

   if (Buffer == NULL) {

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
index 9d44abddd7..300c67f0d4 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
@@ -190,9 +190,6 @@ HMemImageRead (
   CHAR16                          *Str;

   HEFI_EDITOR_LINE                *Line;

 

-  EDIT_FILE_TYPE                  BufferTypeBackup;

-

-  BufferTypeBackup        = HBufferImage.BufferType;

   HBufferImage.BufferType = FileTypeMemBuffer;

 

   Buffer                  = AllocateZeroPool (Size);

@@ -301,8 +298,6 @@ HMemImageSave (
   EFI_STATUS                      Status;

   VOID                            *Buffer;

 

-  EDIT_FILE_TYPE                  BufferTypeBackup;

-

   //

   // not modified, so directly return

   //

@@ -310,7 +305,6 @@ HMemImageSave (
     return EFI_SUCCESS;

   }

 

-  BufferTypeBackup        = HBufferImage.BufferType;

   HBufferImage.BufferType = FileTypeMemBuffer;

 

   Buffer                  = AllocateZeroPool (Size);

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
index c251ea3574..5bb3cff2d1 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
@@ -217,7 +217,6 @@ ShellCommandRunMm (
   UINT64                          Buffer;

   UINTN                           Index;

   UINTN                           Size;

-  CHAR16                          *AddressStr;

 //  CHAR16                          *ValueStr;

   BOOLEAN                         Complete;

   CHAR16                          *InputStr;

@@ -245,7 +244,6 @@ ShellCommandRunMm (
   Width       = EfiPciWidthUint8;

   Size        = 1;

   AccessType  = EfiMemory;

-  AddressStr  = NULL;

 //  ValueStr    = NULL;

   Interactive = TRUE;

   Package     = NULL;

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
index ce55d6e332..4ca1fd1bdd 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
@@ -2054,13 +2054,11 @@ ShellCommandRunPci (
   LIST_ENTRY                        *Package;

   CHAR16                            *ProblemParam;

   SHELL_STATUS                      ShellStatus;

-  UINTN                             Size;

   CONST CHAR16                      *Temp;

 

   ShellStatus         = SHELL_SUCCESS;

   Status              = EFI_SUCCESS;

   Address             = 0;

-  Size                = 0;

   IoDev               = NULL;

   HandleBuf           = NULL;

   Package             = NULL;

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 1d72ea6c3a..c601abebcb 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -490,11 +490,9 @@ EditGetDefaultFileName (
 {

   EFI_STATUS         Status;

   UINTN              Suffix;

-  BOOLEAN            FoundNewFile;

   CHAR16             *FileNameTmp;

 

   Suffix       = 0;

-  FoundNewFile = FALSE;

 

   do {

     FileNameTmp = CatSPrint (NULL, L"NewFile%d.%s", Suffix, Extension);