Update the "ConErr" related variable name to the new one "ErrOut".

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13641 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index c8ac00bc813b4f4082d30d6731794e0ad46f5832..e152a7a3a08dcfb9f09e1e9b9d392f293c66606e 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -609,8 +609,8 @@ UpdateStdInStdOutStdErr(
   SystemTableInfo->ConInHandle    = gST->ConsoleInHandle;\r
   SystemTableInfo->ConOut         = gST->ConOut;\r
   SystemTableInfo->ConOutHandle   = gST->ConsoleOutHandle;\r
-  SystemTableInfo->ConErr         = gST->StdErr;\r
-  SystemTableInfo->ConErrHandle   = gST->StandardErrorHandle;\r
+  SystemTableInfo->ErrOut         = gST->StdErr;\r
+  SystemTableInfo->ErrOutHandle   = gST->StandardErrorHandle;\r
   *OldStdIn                       = ShellParameters->StdIn;\r
   *OldStdOut                      = ShellParameters->StdOut;\r
   *OldStdErr                      = ShellParameters->StdErr;\r
@@ -1200,10 +1200,10 @@ RestoreStdInStdOutStdErr (
     gST->ConOut               = SystemTableInfo->ConOut;\r
     gST->ConsoleOutHandle     = SystemTableInfo->ConOutHandle;\r
   }\r
-  if (gST->StdErr != SystemTableInfo->ConErr) {\r
+  if (gST->StdErr != SystemTableInfo->ErrOut) {\r
     CloseSimpleTextOutOnFile(gST->StdErr);\r
-    gST->StdErr               = SystemTableInfo->ConErr;\r
-    gST->StandardErrorHandle  = SystemTableInfo->ConErrHandle;\r
+    gST->StdErr               = SystemTableInfo->ErrOut;\r
+    gST->StandardErrorHandle  = SystemTableInfo->ErrOutHandle;\r
   }\r
 \r
   CalculateEfiHdrCrc(&gST->Hdr);\r

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.h b/ShellPkg/Application/Shell/ShellParametersProtocol.h
index b63e1d394f9fdd8dfb9956c98ad357211ce6b80a..1853f8c0f4b6335fced87b3e113b83dcd24229b8 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.h
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.h
@@ -2,7 +2,7 @@
   Member functions of EFI_SHELL_PARAMETERS_PROTOCOL and functions for creation,\r
   manipulation, and initialization of EFI_SHELL_PARAMETERS_PROTOCOL.\r
 \r
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2012, 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
@@ -123,8 +123,8 @@ typedef struct {
   EFI_HANDLE                            ConInHandle;\r
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL       *ConOut;\r
   EFI_HANDLE                            ConOutHandle;\r
-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL       *ConErr;\r
-  EFI_HANDLE                            ConErrHandle;\r
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL       *ErrOut;\r
+  EFI_HANDLE                            ErrOutHandle;\r
 } SYSTEM_TABLE_INFO;\r
 \r
 /**\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
index 429964d8c8adcd845289d306fee51c9c975cd1bb..56a110b65fddff6c0ccb5e77c7362ed5b6f3cbe5 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for connect shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2012, 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
@@ -149,9 +149,9 @@ ConnectFromDevPaths (
         Status = ConnectControllers(NULL, Handle, FALSE, TRUE, FALSE);\r
       }\r
     } else if ((StrCmp(Key, L"ConOutDev") == 0) \r
-            || (StrCmp(Key, L"ConErrDev") == 0) \r
+            || (StrCmp(Key, L"ErrOutDev") == 0) \r
             || (StrCmp(Key, L"ConOut")    == 0) \r
-            || (StrCmp(Key, L"ConErr")    == 0)\r
+            || (StrCmp(Key, L"ErrOut")    == 0)\r
             ){\r
       Status = gBS->LocateDevicePath((EFI_GUID*)&gEfiConsoleOutDeviceGuid, &DevPathWalker, &Handle);\r
       if (!EFI_ERROR(Status)) {\r
@@ -299,14 +299,14 @@ ShellCommandRunConnect (
         Status = ConnectFromDevPaths(L"ConOutDev");\r
       }\r
       if (EFI_ERROR(Status)) {\r
-        ConnectFromDevPaths(L"ConErrDev");\r
+        ConnectFromDevPaths(L"ErrOutDev");\r
       } else {\r
-        Status = ConnectFromDevPaths(L"ConErrDev");\r
+        Status = ConnectFromDevPaths(L"ErrOutDev");\r
       }\r
       if (EFI_ERROR(Status)) {\r
-        ConnectFromDevPaths(L"ConErr");\r
+        ConnectFromDevPaths(L"ErrOut");\r
       } else {\r
-        Status = ConnectFromDevPaths(L"ConErr");\r
+        Status = ConnectFromDevPaths(L"ErrOut");\r
       }\r
       if (EFI_ERROR(Status)) {\r
         ConnectFromDevPaths(L"ConIn");\r