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

diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 68d4fb4d923623f0df6370f43355ad07f2ca0407..c5b836aaf9e1a28585766cfe2b7197bb431423cc 100644 (file)
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -994,7 +994,6 @@ InternalOpenFileDevicePath(
   SHELL_FILE_HANDLE               ShellHandle;\r
   EFI_FILE_PROTOCOL               *Handle1;\r
   EFI_FILE_PROTOCOL               *Handle2;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DpCopy;\r
   FILEPATH_DEVICE_PATH            *AlignedNode;\r
 \r
   if (FileHandle == NULL) {\r
@@ -1004,7 +1003,6 @@ InternalOpenFileDevicePath(
   Handle1       = NULL;\r
   Handle2       = NULL;\r
   Handle        = NULL;\r
-  DpCopy        = DevicePath;\r
   ShellHandle   = NULL;\r
   FilePathNode  = NULL;\r
   AlignedNode   = NULL;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
index 095a9460e6ca4e76b30d4b172cd1be0a93eb0feb..c26fad7b38b2b52ed55e9f400b45c59fc59824df 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
@@ -293,7 +293,7 @@ BcfgAddDebug1(
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *FilePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  *FileNode;\r
+  /* EFI_DEVICE_PATH_PROTOCOL  *FileNode; */\r
   CHAR16                    *Str;\r
   UINT8                     *TempByteBuffer;\r
   UINT8                     *TempByteStart;\r
@@ -328,7 +328,7 @@ BcfgAddDebug1(
 \r
   Str             = NULL;\r
   FilePath        = NULL;\r
-  FileNode        = NULL;\r
+  /* FileNode        = NULL; */\r
   FileList        = NULL;\r
   Handles         = NULL;\r
   ShellStatus     = SHELL_SUCCESS;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
index 978ce7f13a1f403c7cde1dcd4368fb26696f5d3c..649ed579558e1d7a72bd38c840a02be70a3fedc4 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
@@ -133,8 +133,6 @@ InputBarRefresh (
   UINTN                   Size;\r
   EFI_STATUS              Status;\r
   BOOLEAN                 NoDisplay;\r
-  UINTN                   Limit;\r
-  UINTN                   mPromptLen;\r
   UINTN                   EventIndex;\r
   UINTN                   CursorRow;\r
   UINTN                   CursorCol;\r
@@ -164,12 +162,6 @@ InputBarRefresh (
   gST->ConOut->SetCursorPosition (gST->ConOut, 0, LastRow - 1);\r
   ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gShellDebug1HiiHandle, mPrompt);\r
 \r
-  //\r
-  // that's the maximum input length that can be displayed on screen\r
-  //\r
-  mPromptLen = StrLen (mPrompt);\r
-  Limit     = LastColumn - mPromptLen;\r
-\r
   //\r
   // this is a selection mPrompt, cursor will stay in edit area\r
   // actually this is for search , search/replace\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index 46926320a63c21aeb99262ddc94616689b435d5c..bfedf58d78a2dabe202138f960980c57b3a9cfd0 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -752,7 +752,6 @@ HBufferImageRefresh (
   UINTN                   StartRow;\r
   UINTN                   EndRow;\r
   UINTN                   FStartRow;\r
-  UINTN                   FEndRow;\r
   UINTN                   Tmp;\r
 \r
   Orig                  = HMainEditor.ColorAttributes;\r
@@ -821,7 +820,6 @@ HBufferImageRefresh (
       }\r
 \r
       FStartRow = StartRow;\r
-      FEndRow   = EndRow;\r
 \r
       StartRow  = 2 + StartRow - HBufferImage.LowVisibleRow;\r
       EndRow    = 2 + EndRow - HBufferImage.LowVisibleRow;\r
@@ -1750,14 +1748,11 @@ HBufferImagePageUp (
   VOID\r
   )\r
 {\r
-  HEFI_EDITOR_LINE  *Line;\r
   UINTN             FRow;\r
   UINTN             FCol;\r
   UINTN             Gap;\r
   INTN              Retreat;\r
 \r
-  Line  = HBufferImage.CurrentLine;\r
-\r
   FRow  = HBufferImage.BufferPosition.Row;\r
   FCol  = HBufferImage.BufferPosition.Column;\r
 \r
@@ -1776,11 +1771,6 @@ HBufferImagePageUp (
   Retreat = Gap;\r
   Retreat = -Retreat;\r
 \r
-  //\r
-  // get correct line\r
-  //\r
-  Line = HMoveLine (Retreat);\r
-\r
   FRow -= Gap;\r
 \r
   HBufferImageMovePosition (FRow, FCol, HBufferImage.HighBits);\r
@@ -1798,13 +1788,10 @@ HBufferImageHome (
   VOID\r
   )\r
 {\r
-  HEFI_EDITOR_LINE  *Line;\r
   UINTN             FRow;\r
   UINTN             FCol;\r
   BOOLEAN           HighBits;\r
 \r
-  Line = HBufferImage.CurrentLine;\r
-\r
   //\r
   // curosr will at the high bit\r
   //\r
@@ -1918,7 +1905,6 @@ HBufferImageDeleteCharacterFromBuffer (
 \r
   HEFI_EDITOR_LINE  *Line;\r
   LIST_ENTRY    *Link;\r
-  UINTN             StartRow;\r
 \r
   UINTN             OldFCol;\r
   UINTN             OldFRow;\r
@@ -1928,11 +1914,6 @@ HBufferImageDeleteCharacterFromBuffer (
 \r
   EFI_STATUS        Status;\r
 \r
-  //\r
-  // get the line that start position is at\r
-  //\r
-  StartRow  = Pos / 0x10;\r
-\r
   Size      = HBufferImageGetTotalSize ();\r
 \r
   if (Size < Count) {\r
@@ -2054,7 +2035,6 @@ HBufferImageAddCharacterToBuffer (
   HEFI_EDITOR_LINE  *Line;\r
 \r
   LIST_ENTRY    *Link;\r
-  UINTN             StartRow;\r
 \r
   UINTN             OldFCol;\r
   UINTN             OldFRow;\r
@@ -2062,11 +2042,6 @@ HBufferImageAddCharacterToBuffer (
 \r
   UINTN             NewPos;\r
 \r
-  //\r
-  // get the line that start position is at\r
-  //\r
-  StartRow  = Pos / 0x10;\r
-\r
   Size      = HBufferImageGetTotalSize ();\r
 \r
   //\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
index c956f77b28cf8e646bad3318a583ee422ff728d3..a50b52f5f207b68d51dc7cbf2a0aeb0683ee0ded 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
@@ -181,11 +181,7 @@ HDiskImageRead (
   UINTN                           Bytes;\r
 \r
   HEFI_EDITOR_LINE                *Line;\r
-  UINT64                          ByteOffset;\r
 \r
-  EDIT_FILE_TYPE                  BufferTypeBackup;\r
-\r
-  BufferTypeBackup        = HBufferImage.BufferType;\r
   HBufferImage.BufferType = FileTypeDiskBuffer;\r
 \r
   DevicePath              = gEfiShellProtocol->GetDevicePathFromMap(DeviceName);\r
@@ -226,8 +222,6 @@ HDiskImageRead (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);\r
-\r
   //\r
   // read from disk\r
   //\r
@@ -355,10 +349,6 @@ HDiskImageSave (
   VOID                            *Buffer;\r
   UINTN                           Bytes;\r
 \r
-  UINT64                          ByteOffset;\r
-\r
-  EDIT_FILE_TYPE                  BufferTypeBackup;\r
-\r
   //\r
   // if not modified, directly return\r
   //\r
@@ -366,7 +356,6 @@ HDiskImageSave (
     return EFI_SUCCESS;\r
   }\r
 \r
-  BufferTypeBackup        = HBufferImage.BufferType;\r
   HBufferImage.BufferType = FileTypeDiskBuffer;\r
 \r
   DevicePath              = gEfiShellProtocol->GetDevicePathFromMap(DeviceName);\r
@@ -406,8 +395,6 @@ HDiskImageSave (
     return Status;\r
   }\r
 \r
-  ByteOffset = MultU64x32 (Offset, BlkIo->Media->BlockSize);\r
-\r
   //\r
   // write the buffer to disk\r
   //\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
index 68074d424450b5133d3a8d35689be7059f1bda60..8cbfd2c8f68a29ad1d8dbf8f67afc759f26170fb 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEdit.c
@@ -43,25 +43,19 @@ ShellCommandRunHexEdit (
   CHAR16                  *ProblemParam;\r
   SHELL_STATUS            ShellStatus;\r
   LIST_ENTRY              *Package;\r
-  CONST CHAR16            *Cwd;\r
   CHAR16                  *NewName;\r
-  CHAR16                  *Spot;\r
   CONST CHAR16            *Name;\r
   UINTN                   Offset;\r
   UINTN                   Size;\r
-  UINT64                  LastOffset;\r
   EDIT_FILE_TYPE          WhatToDo;\r
 \r
   Buffer      = NULL;\r
   ShellStatus = SHELL_SUCCESS;\r
   NewName         = NULL;\r
-  Cwd         = NULL;\r
   Buffer      = NULL;\r
   Name        = NULL;\r
-  Spot        = NULL;\r
   Offset      = 0;\r
   Size        = 0;\r
-  LastOffset  = 0;\r
   WhatToDo    = FileTypeNone;\r
 \r
   //\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index 09213d897d0f42931c438027074e71192958420a..a40388ff4097d4cb44fbd62ab687b0a29e018d02 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -598,7 +598,6 @@ HMainCommandCut (
   )\r
 {\r
   UINTN             Index;\r
-  HEFI_EDITOR_LINE  *Line;\r
   LIST_ENTRY    *Link;\r
   UINT8             *Buffer;\r
   UINTN             Count;\r
@@ -623,8 +622,6 @@ HMainCommandCut (
     Link = Link->ForwardLink;\r
   }\r
 \r
-  Line    = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST);\r
-\r
   Count   = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;\r
   Buffer  = AllocateZeroPool (Count);\r
   if (Buffer == NULL) {\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
index 9d44abddd7fe59e4d9e66798f23647604fcd16b9..300c67f0d4fe4ed611eaa98473c879d858e4fcce 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
@@ -190,9 +190,6 @@ HMemImageRead (
   CHAR16                          *Str;\r
   HEFI_EDITOR_LINE                *Line;\r
 \r
-  EDIT_FILE_TYPE                  BufferTypeBackup;\r
-\r
-  BufferTypeBackup        = HBufferImage.BufferType;\r
   HBufferImage.BufferType = FileTypeMemBuffer;\r
 \r
   Buffer                  = AllocateZeroPool (Size);\r
@@ -301,8 +298,6 @@ HMemImageSave (
   EFI_STATUS                      Status;\r
   VOID                            *Buffer;\r
 \r
-  EDIT_FILE_TYPE                  BufferTypeBackup;\r
-\r
   //\r
   // not modified, so directly return\r
   //\r
@@ -310,7 +305,6 @@ HMemImageSave (
     return EFI_SUCCESS;\r
   }\r
 \r
-  BufferTypeBackup        = HBufferImage.BufferType;\r
   HBufferImage.BufferType = FileTypeMemBuffer;\r
 \r
   Buffer                  = AllocateZeroPool (Size);\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
index c251ea35741b2e241b080b27663e157427cc5004..5bb3cff2d1a5aaa111490c331f9c84335622667d 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
@@ -217,7 +217,6 @@ ShellCommandRunMm (
   UINT64                          Buffer;\r
   UINTN                           Index;\r
   UINTN                           Size;\r
-  CHAR16                          *AddressStr;\r
 //  CHAR16                          *ValueStr;\r
   BOOLEAN                         Complete;\r
   CHAR16                          *InputStr;\r
@@ -245,7 +244,6 @@ ShellCommandRunMm (
   Width       = EfiPciWidthUint8;\r
   Size        = 1;\r
   AccessType  = EfiMemory;\r
-  AddressStr  = NULL;\r
 //  ValueStr    = NULL;\r
   Interactive = TRUE;\r
   Package     = NULL;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
index ce55d6e33256c85b34f53e35ff96e0867a89c54d..4ca1fd1bdd300cabf8590e575f36bf5b859dde22 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
@@ -2054,13 +2054,11 @@ ShellCommandRunPci (
   LIST_ENTRY                        *Package;\r
   CHAR16                            *ProblemParam;\r
   SHELL_STATUS                      ShellStatus;\r
-  UINTN                             Size;\r
   CONST CHAR16                      *Temp;\r
 \r
   ShellStatus         = SHELL_SUCCESS;\r
   Status              = EFI_SUCCESS;\r
   Address             = 0;\r
-  Size                = 0;\r
   IoDev               = NULL;\r
   HandleBuf           = NULL;\r
   Package             = NULL;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 1d72ea6c3a83f4655b5b29709921e64bafba176f..c601abebcb2ce5d574d295db25a62c706c6cfd3d 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -490,11 +490,9 @@ EditGetDefaultFileName (
 {\r
   EFI_STATUS         Status;\r
   UINTN              Suffix;\r
-  BOOLEAN            FoundNewFile;\r
   CHAR16             *FileNameTmp;\r
 \r
   Suffix       = 0;\r
-  FoundNewFile = FALSE;\r
 \r
   do {\r
     FileNameTmp = CatSPrint (NULL, L"NewFile%d.%s", Suffix, Extension);\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index a0dc1394117f441754fe67759f9c0025df4909b0..9947c56117fcd642d188052501595bb8505ed624 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -674,9 +674,7 @@ DoDhByHandle(
 {\r
   CHAR16              *ProtocolInfoString;\r
   SHELL_STATUS        ShellStatus;\r
-  EFI_STATUS          Status;\r
 \r
-  Status              = EFI_SUCCESS;\r
   ShellStatus         = SHELL_SUCCESS;\r
   ProtocolInfoString  = NULL;\r
 \r

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
index a7a10bf3bba63cb725708565ab652f862ff13c10..5dcbfb6950e0f8cc70a5267cc5a09610fd61c064 100644 (file)
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for bcfg shell Install1 function.\r
 \r
-  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2013, 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
@@ -293,7 +293,6 @@ BcfgAddInstall1(
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *FilePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  *FileNode;\r
   CHAR16                    *Str;\r
   UINT8                     *TempByteBuffer;\r
   UINT8                     *TempByteStart;\r
@@ -328,7 +327,6 @@ BcfgAddInstall1(
 \r
   Str             = NULL;\r
   FilePath        = NULL;\r
-  FileNode        = NULL;\r
   FileList        = NULL;\r
   Handles         = NULL;\r
   ShellStatus     = SHELL_SUCCESS;\r

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
index 08927319d33a041eabb9419d3cefb04f33e0401b..54ed23b59b87614e9e39d5cd489193743d9ff7f0 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
@@ -662,12 +662,9 @@ BuildNextStatement (
   OUT END_TAG_TYPE  *EndTag\r
   )\r
 {\r
-  CHAR16    *Buffer;\r
-  UINTN     BufferSize;\r
-\r
   *EndTag = EndTagMax;\r
 \r
-  for(Buffer = NULL, BufferSize = 0\r
+  for(\r
     ; ParameterNumber < gEfiShellParametersProtocol->Argc\r
     ; ParameterNumber++\r
    ) {\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 876cb9d3ef8c0cacd0e99c60e88356ed8103b5e4..4443212a12009f9d4ef4d2e6d5db61f9cece5b19 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -87,6 +87,7 @@ CopySingleFile(
   Response        = *Resp;\r
   List            = NULL;\r
   DestVolumeInfo  = NULL;\r
+  ShellStatus     = SHELL_SUCCESS;\r
 \r
   ReadSize = PcdGet16(PcdShellFileOperationSize);\r
   // Why bother copying a file to itself\r
@@ -255,7 +256,7 @@ CopySingleFile(
   //\r
   // return\r
   //\r
-  return (SHELL_SUCCESS);\r
+  return ShellStatus;\r
 }\r
 \r
 /**\r
@@ -537,12 +538,11 @@ ProcessValidateAndCopyFiles(
 {\r
   SHELL_STATUS        ShellStatus;\r
   EFI_SHELL_FILE_INFO *List;\r
-  EFI_STATUS          Status;\r
   EFI_FILE_INFO       *FileInfo;\r
 \r
   List = NULL;\r
 \r
-  Status = ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_READ, &List);\r
+  ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_READ, &List);\r
   if (List != NULL && List->Link.ForwardLink != List->Link.BackLink) {\r
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MARG_ERROR), gShellLevel2HiiHandle, DestDir);\r
     ShellStatus = SHELL_INVALID_PARAMETER;\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
index 5edb9d77355067bfdb1095a3a58fb88d6210fe99..98ef4b88f33b65bed04857bf559f6bcd5849e9cf 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
@@ -81,13 +81,11 @@ LoadDriver(
 {\r
   EFI_HANDLE                    LoadedDriverHandle;\r
   EFI_STATUS                    Status;\r
-  EFI_DEVICE_PATH_PROTOCOL      *Node;\r
   EFI_DEVICE_PATH_PROTOCOL      *FilePath;\r
   EFI_LOADED_IMAGE_PROTOCOL     *LoadedDriverImage;\r
 \r
   LoadedDriverImage   = NULL;\r
   FilePath            = NULL;\r
-  Node                = NULL;\r
   LoadedDriverHandle  = NULL;\r
   Status              = EFI_SUCCESS;\r
 \r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index a1f9448df92854fb63aabea2549fc96c798f5e3b..78e432bcd4f98f8fc1b4186ded67675bce613841 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1025,7 +1025,6 @@ ShellCommandRunMap (
   CONST CHAR16  *SName;\r
   CONST CHAR16  *Mapping;\r
   EFI_HANDLE    MapAsHandle;\r
-  CONST EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
   SHELL_STATUS  ShellStatus;\r
   BOOLEAN       SfoMode;\r
   BOOLEAN       ConstMode;\r
@@ -1037,7 +1036,6 @@ ShellCommandRunMap (
   ProblemParam  = NULL;\r
   Mapping       = NULL;\r
   SName         = NULL;\r
-  DevPath       = NULL;\r
   ShellStatus   = SHELL_SUCCESS;\r
   MapAsHandle = NULL;\r
 \r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index 541e782925ab2fe6e5bbe08860c087ca56804295..11abee07664b12d2a114c835a395fa856e2b2e32 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -135,7 +135,6 @@ GetDestinationLocation(
 {\r
   EFI_SHELL_FILE_INFO       *DestList;\r
   EFI_SHELL_FILE_INFO       *Node;\r
-  EFI_STATUS                Status;\r
   CHAR16                    *DestPath;\r
   CHAR16                    *TempLocation;\r
   UINTN                     NewSize;\r
@@ -159,7 +158,7 @@ GetDestinationLocation(
   //\r
   // get the destination path\r
   //\r
-  Status = ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, &DestList);\r
+  ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, &DestList);\r
   if (DestList == NULL || IsListEmpty(&DestList->Link)) {\r
     //\r
     // Not existing... must be renaming\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
index d167b36fb4507eb1d5362832a17c04939cc41d1c..2eb54d3e393a992e6831243f491c6111690b456a 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
@@ -33,7 +33,6 @@ IsDirectoryEmpty (
   IN EFI_HANDLE   FileHandle\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
   EFI_FILE_INFO   *FileInfo;\r
   BOOLEAN         NoFile;\r
   BOOLEAN         RetVal;\r
@@ -41,9 +40,9 @@ IsDirectoryEmpty (
   RetVal = TRUE;\r
   NoFile = FALSE;\r
 \r
-  for (Status = FileHandleFindFirstFile(FileHandle, &FileInfo)\r
+  for (FileHandleFindFirstFile(FileHandle, &FileInfo)\r
     ;  !NoFile\r
-    ;  Status = FileHandleFindNextFile(FileHandle, FileInfo, &NoFile)\r
+    ;  FileHandleFindNextFile(FileHandle, FileInfo, &NoFile)\r
    ){\r
     if (StrStr(FileInfo->FileName, L".") != FileInfo->FileName\r
       &&StrStr(FileInfo->FileName, L"..") != FileInfo->FileName) {\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
index dfe03fdd2092a693b7bf8dcce9feace576e8d6f4..e5596ba04bbeeb59907daf4166647f1c8e740544 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
@@ -378,7 +378,6 @@ ShellCommandRunTime (
 {\r
   EFI_STATUS    Status;\r
   LIST_ENTRY    *Package;\r
-  CHAR16        *Message;\r
   EFI_TIME      TheTime;\r
   CHAR16        *ProblemParam;\r
   SHELL_STATUS  ShellStatus;\r
@@ -387,13 +386,11 @@ ShellCommandRunTime (
   CONST CHAR16  *TempLocation;\r
   UINTN         TzMinutes;\r
 \r
-  ShellStatus  = SHELL_SUCCESS;\r
-  ProblemParam = NULL;\r
-\r
   //\r
   // Initialize variables\r
   //\r
-  Message = NULL;\r
+  ShellStatus  = SHELL_SUCCESS;\r
+  ProblemParam = NULL;\r
 \r
   //\r
   // initialize the shell lib (we must be in non-auto-init...)\r

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Cls.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Cls.c
index dec24776ff53033e97dfafeceb55f65f94547d12..8cb1aedf43eba2f6b64230d9c438b4d583b6ab28 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Cls.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Cls.c
@@ -29,21 +29,18 @@ ShellCommandRunCls (
 {\r
   EFI_STATUS    Status;\r
   LIST_ENTRY    *Package;\r
-  CHAR16        *Message;\r
   UINTN         Background;\r
   UINTN         ForeColor;\r
   CHAR16        *ProblemParam;\r
   SHELL_STATUS  ShellStatus;\r
   CONST CHAR16  *Param1;\r
 \r
-  ShellStatus   = SHELL_SUCCESS;\r
-  ProblemParam  = NULL;\r
-  Background    = 0;\r
-\r
   //\r
   // Initialize variables\r
   //\r
-  Message = NULL;\r
+  ShellStatus   = SHELL_SUCCESS;\r
+  ProblemParam  = NULL;\r
+  Background    = 0;\r
 \r
   //\r
   // initialize the shell lib (we must be in non-auto-init...)\r

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
index c4acc0b499be0a8a75fb61d6b3f6fb19b1e5f69b..cd03ff7f07f2cae6fda7186fb6f3b7c52421ddd5 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
@@ -41,7 +41,6 @@ ShellCommandRunHelp (
   LIST_ENTRY          *Package;\r
   CHAR16              *ProblemParam;\r
   SHELL_STATUS        ShellStatus;\r
-  CHAR16              *OutText;\r
   CONST COMMAND_LIST  *CommandList;\r
   CONST COMMAND_LIST  *Node;\r
   CHAR16              *CommandToGetHelpOn;\r
@@ -53,7 +52,6 @@ ShellCommandRunHelp (
   PrintCommandText    = TRUE;\r
   ProblemParam        = NULL;\r
   ShellStatus         = SHELL_SUCCESS;\r
-  OutText             = NULL;\r
   CommandToGetHelpOn  = NULL;\r
   SectionToGetHelpOn  = NULL;\r
   Found               = FALSE;\r