From 4ccd9214a494447d1a540255b0569e36ab12e1c6 Mon Sep 17 00:00:00 2001
From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 17 Aug 2012 03:58:17 +0000
Subject: [PATCH] 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
---
 .../Application/Shell/ShellParametersProtocol.c    | 10 +++++-----
 .../Application/Shell/ShellParametersProtocol.h    |  6 +++---
 .../Library/UefiShellDriver1CommandsLib/Connect.c  | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index c8ac00bc81..e152a7a3a0 100644
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -609,8 +609,8 @@ UpdateStdInStdOutStdErr(
   SystemTableInfo->ConInHandle    = gST->ConsoleInHandle;
   SystemTableInfo->ConOut         = gST->ConOut;
   SystemTableInfo->ConOutHandle   = gST->ConsoleOutHandle;
-  SystemTableInfo->ConErr         = gST->StdErr;
-  SystemTableInfo->ConErrHandle   = gST->StandardErrorHandle;
+  SystemTableInfo->ErrOut         = gST->StdErr;
+  SystemTableInfo->ErrOutHandle   = gST->StandardErrorHandle;
   *OldStdIn                       = ShellParameters->StdIn;
   *OldStdOut                      = ShellParameters->StdOut;
   *OldStdErr                      = ShellParameters->StdErr;
@@ -1200,10 +1200,10 @@ RestoreStdInStdOutStdErr (
     gST->ConOut               = SystemTableInfo->ConOut;
     gST->ConsoleOutHandle     = SystemTableInfo->ConOutHandle;
   }
-  if (gST->StdErr != SystemTableInfo->ConErr) {
+  if (gST->StdErr != SystemTableInfo->ErrOut) {
     CloseSimpleTextOutOnFile(gST->StdErr);
-    gST->StdErr               = SystemTableInfo->ConErr;
-    gST->StandardErrorHandle  = SystemTableInfo->ConErrHandle;
+    gST->StdErr               = SystemTableInfo->ErrOut;
+    gST->StandardErrorHandle  = SystemTableInfo->ErrOutHandle;
   }
 
   CalculateEfiHdrCrc(&gST->Hdr);
diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.h b/ShellPkg/Application/Shell/ShellParametersProtocol.h
index b63e1d394f..1853f8c0f4 100644
--- 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,
   manipulation, and initialization of EFI_SHELL_PARAMETERS_PROTOCOL.
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, 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
@@ -123,8 +123,8 @@ typedef struct {
   EFI_HANDLE                            ConInHandle;
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL       *ConOut;
   EFI_HANDLE                            ConOutHandle;
-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL       *ConErr;
-  EFI_HANDLE                            ConErrHandle;
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL       *ErrOut;
+  EFI_HANDLE                            ErrOutHandle;
 } SYSTEM_TABLE_INFO;
 
 /**
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
index 429964d8c8..56a110b65f 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for connect shell Driver1 function.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2012, 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
@@ -149,9 +149,9 @@ ConnectFromDevPaths (
         Status = ConnectControllers(NULL, Handle, FALSE, TRUE, FALSE);
       }
     } else if ((StrCmp(Key, L"ConOutDev") == 0) 
-            || (StrCmp(Key, L"ConErrDev") == 0) 
+            || (StrCmp(Key, L"ErrOutDev") == 0) 
             || (StrCmp(Key, L"ConOut")    == 0) 
-            || (StrCmp(Key, L"ConErr")    == 0)
+            || (StrCmp(Key, L"ErrOut")    == 0)
             ){
       Status = gBS->LocateDevicePath((EFI_GUID*)&gEfiConsoleOutDeviceGuid, &DevPathWalker, &Handle);
       if (!EFI_ERROR(Status)) {
@@ -299,14 +299,14 @@ ShellCommandRunConnect (
         Status = ConnectFromDevPaths(L"ConOutDev");
       }
       if (EFI_ERROR(Status)) {
-        ConnectFromDevPaths(L"ConErrDev");
+        ConnectFromDevPaths(L"ErrOutDev");
       } else {
-        Status = ConnectFromDevPaths(L"ConErrDev");
+        Status = ConnectFromDevPaths(L"ErrOutDev");
       }
       if (EFI_ERROR(Status)) {
-        ConnectFromDevPaths(L"ConErr");
+        ConnectFromDevPaths(L"ErrOut");
       } else {
-        Status = ConnectFromDevPaths(L"ConErr");
+        Status = ConnectFromDevPaths(L"ErrOut");
       }
       if (EFI_ERROR(Status)) {
         ConnectFromDevPaths(L"ConIn");
-- 
2.39.2