From e755a4ca10aad316c3620223206d63982793b26c Mon Sep 17 00:00:00 2001
From: jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 7 May 2013 17:57:58 +0000
Subject: 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
---
 ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c')

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


From cbcccd2c9d93a35884c344a3feaa773338675dff Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 13 May 2013 02:36:09 +0000
Subject: Update Code to pass EBC compiler. Signed-off-by: Liming Gao
 <liming.gao@intel.com> Reviewed-by: Star Zeng <star.zeng@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14352 6f19259b-4bc3-4df7-8a09-765794883524
---
 ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c')

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 78e432bcd4..2725f4ad39 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for map shell level 2 command.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -1091,18 +1091,15 @@ ShellCommandRunMap (
           if (SName != NULL) {
             Status = PerformMappingDelete(SName);
             if (EFI_ERROR(Status)) {
-              switch (Status) {
-                case EFI_ACCESS_DENIED:
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle);
-                  ShellStatus = SHELL_ACCESS_DENIED;
-                  break;
-                case EFI_NOT_FOUND:
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, SName);
-                  ShellStatus = SHELL_INVALID_PARAMETER;
-                  break;
-                default:
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);
-                  ShellStatus = SHELL_UNSUPPORTED;
+              if (Status == EFI_ACCESS_DENIED) {
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle);
+                ShellStatus = SHELL_ACCESS_DENIED;
+              } else if (Status == EFI_NOT_FOUND) {
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, SName);
+                ShellStatus = SHELL_INVALID_PARAMETER;
+              } else {
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);
+                ShellStatus = SHELL_UNSUPPORTED;
               }
             }
           } else {
-- 
cgit v1.2.3