ShellPkg: Clean-up 'map' command error message handling

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Map.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index a41a5f1cf6c151bdb9fd30846d6a8342c948ebe8..035aff1a0fa78f17cb8aefcd886f95b3c5945973 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,8 +1,10 @@
 /** @file\r
   Main file for map shell level 2 command.\r
 \r
-  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
   Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+  \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
@@ -1196,51 +1198,48 @@ ShellCommandRunMap (
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);  \r
             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r
-            if (MapAsHandle != NULL) {\r
-              TempStringLength = StrLen(SName);\r
-              if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
-                ShellStatus = SHELL_INVALID_PARAMETER;\r
-              } else {\r
+            TempStringLength = StrLen(SName);\r
+            if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
+              ShellStatus = SHELL_INVALID_PARAMETER;\r
+            }\r
+\r
+            if (ShellStatus == SHELL_SUCCESS) {\r
+              if (MapAsHandle != NULL) {\r
                 ShellStatus = AddMappingFromHandle(MapAsHandle, SName);\r
-              }\r
-            } else {\r
-              TempStringLength = StrLen(SName);\r
-              if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
-                ShellStatus = SHELL_INVALID_PARAMETER;\r
               } else {\r
                 ShellStatus = AddMappingFromMapping(Mapping, SName);\r
               }\r
+\r
+              if (ShellStatus != SHELL_SUCCESS) {\r
+                switch (ShellStatus) {\r
+                  case SHELL_ACCESS_DENIED:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
+                    break;\r
+                  case SHELL_INVALID_PARAMETER:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
+                    break;\r
+                  case SHELL_DEVICE_ERROR:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);\r
+                    break;\r
+                  default:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);\r
+                }\r
+              } else {\r
+                //\r
+                // now do the display...\r
+                //\r
+                ShellStatus = PerformMappingDisplay(\r
+                  FALSE,\r
+                  FALSE,\r
+                  FALSE,\r
+                  NULL,\r
+                  SfoMode,\r
+                  SName,\r
+                  TRUE\r
+                 );\r
+              } // we were sucessful so do an output\r
             }\r
-            if (ShellStatus != SHELL_SUCCESS) {\r
-              switch (ShellStatus) {\r
-                case SHELL_ACCESS_DENIED:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
-                  break;\r
-                case SHELL_INVALID_PARAMETER:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
-                  break;\r
-                case SHELL_DEVICE_ERROR:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);\r
-                  break;\r
-                default:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);\r
-              }\r
-            } else {\r
-              //\r
-              // now do the display...\r
-              //\r
-              ShellStatus = PerformMappingDisplay(\r
-                FALSE,\r
-                FALSE,\r
-                FALSE,\r
-                NULL,\r
-                SfoMode,\r
-                SName,\r
-                TRUE\r
-               );\r
-            } // we were sucessful so do an output\r
           } // got a valid map target\r
         } // got 2 variables\r
       } // we are adding a mapping\r