From nobody Fri Dec 27 03:18:04 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1503994278093225.8800028856656; Tue, 29 Aug 2017 01:11:18 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AEF8521E2BE58; Tue, 29 Aug 2017 01:08:33 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 77A2C21C9127B for ; Tue, 29 Aug 2017 01:08:32 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Aug 2017 01:11:12 -0700 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.2]) by fmsmga001.fm.intel.com with ESMTP; 29 Aug 2017 01:11:11 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,444,1498546800"; d="scan'208";a="1189250906" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Tue, 29 Aug 2017 16:11:05 +0800 Message-Id: <20170829081107.442452-2-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.12.2.windows.2 In-Reply-To: <20170829081107.442452-1-ruiyu.ni@intel.com> References: <20170829081107.442452-1-ruiyu.ni@intel.com> Subject: [edk2] [PATCH 1/3] ShellPkg: Rename gShellCurDir to gShellCurMapping X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Huajing Li MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Huajing Li Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Huajing Li Reviewed-by: Ruiyu Ni --- ShellPkg/Application/Shell/ShellProtocol.c | 8 ++++---- ShellPkg/Include/Library/ShellCommandLib.h | 4 ++-- ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Applicat= ion/Shell/ShellProtocol.c index 991fb58ca7..40e5e653ae 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -3079,10 +3079,10 @@ EfiShellSetCurDir( // make that the current file system mapping // if (MapListItem !=3D NULL) { - gShellCurDir =3D MapListItem; + gShellCurMapping =3D MapListItem; } } else { - MapListItem =3D gShellCurDir; + MapListItem =3D gShellCurMapping; } =20 if (MapListItem =3D=3D NULL) { @@ -3131,7 +3131,7 @@ EfiShellSetCurDir( FreePool (DirectoryName); return (EFI_INVALID_PARAMETER); } -// gShellCurDir =3D MapListItem; +// gShellCurMapping =3D MapListItem; if (DirectoryName !=3D NULL) { // // change current dir on that file system @@ -3157,7 +3157,7 @@ EfiShellSetCurDir( // // if updated the current directory then update the environment variable // - if (MapListItem =3D=3D gShellCurDir) { + if (MapListItem =3D=3D gShellCurMapping) { Size =3D 0; ASSERT((TempString =3D=3D NULL && Size =3D=3D 0) || (TempString !=3D N= ULL)); StrnCatGrow(&TempString, &Size, MapListItem->MapName, 0); diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/= Library/ShellCommandLib.h index c11d81d506..616b0d3267 100644 --- a/ShellPkg/Include/Library/ShellCommandLib.h +++ b/ShellPkg/Include/Library/ShellCommandLib.h @@ -4,7 +4,7 @@ This library is for use ONLY by shell commands linked into the shell app= lication. This library will not function if it is used for UEFI Shell 2.0 Applicat= ions. =20 - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
(C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.
This program and the accompanying materials @@ -48,7 +48,7 @@ typedef struct { /// List of Mappings - DeviceName and Drive Letter(ism). extern SHELL_MAP_LIST gShellMapList; /// Pointer to node of current directory in the mMapList. -extern SHELL_MAP_LIST *gShellCurDir; +extern SHELL_MAP_LIST *gShellCurMapping; =20 /** Returns the help MAN fileName for a given shell command. diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/S= hellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c index bd14878052..b9158d1243 100644 --- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c +++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c @@ -1,7 +1,7 @@ /** @file Provides interface to shell internal functions for shell commands. =20 - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
=20 @@ -53,7 +53,7 @@ STATIC CONST CHAR8 Hex[] =3D { // global variables required by library class. EFI_UNICODE_COLLATION_PROTOCOL *gUnicodeCollation =3D NULL; SHELL_MAP_LIST gShellMapList; -SHELL_MAP_LIST *gShellCurDir =3D NULL; +SHELL_MAP_LIST *gShellCurMapping =3D NULL; =20 CONST CHAR16* SupportLevel[] =3D { L"Minimal", @@ -229,7 +229,7 @@ ShellCommandLibDestructor ( } =20 gUnicodeCollation =3D NULL; - gShellCurDir =3D NULL; + gShellCurMapping =3D NULL; =20 return (RETURN_SUCCESS); } --=20 2.12.2.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel