From nobody Sat Nov 2 16:31:20 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.zoho.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 1488180167726552.9627250919697; Sun, 26 Feb 2017 23:22:47 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4FE03820B2; Sun, 26 Feb 2017 23:22:44 -0800 (PST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 C26C681EFA for ; Sun, 26 Feb 2017 23:22:43 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP; 26 Feb 2017 23:22:43 -0800 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by fmsmga005.fm.intel.com with ESMTP; 26 Feb 2017 23:22:42 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,213,1484035200"; d="scan'208";a="69934207" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Mon, 27 Feb 2017 15:22:30 +0800 Message-Id: <20170227072239.273228-3-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20170227072239.273228-1-ruiyu.ni@intel.com> References: <20170227072239.273228-1-ruiyu.ni@intel.com> Subject: [edk2] [PATCH v2 02/11] MdePkg/UefiDevicePathLib: Rename StrToGuid to avoid link failure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao 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" Since the next patch will add StrToGuid in BaseLib, renaming the internal function StrToGuid to DevicePathLibStrToGuid to avoid link failure. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Liming Gao --- MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c | 18 +++++++++------= --- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg= /Library/UefiDevicePathLib/DevicePathFromText.c index 8a3a470..e2b06a2 100644 --- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c @@ -1,7 +1,7 @@ /** @file DevicePathFromText protocol as defined in the UEFI 2.0 specification. =20 -Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
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 @@ -397,7 +397,7 @@ StrToBuf ( =20 **/ EFI_STATUS -StrToGuid ( +DevicePathLibStrToGuid ( IN CHAR16 *Str, OUT EFI_GUID *Guid ) @@ -740,7 +740,7 @@ ConvertFromTextVendor ( (UINT16) (sizeof (VENDOR_DEVICE_PATH)= + Length) ); =20 - StrToGuid (GuidStr, &Vendor->Guid); + DevicePathLibStrToGuid (GuidStr, &Vendor->Guid); StrToBuf (((UINT8 *) Vendor) + sizeof (VENDOR_DEVICE_PATH), Length, Data= Str); =20 return (EFI_DEVICE_PATH_PROTOCOL *) Vendor; @@ -1453,7 +1453,7 @@ DevPathFromTextInfiniband ( ); =20 InfiniBand->ResourceFlags =3D (UINT32) Strtoi (FlagsStr); - StrToGuid (GuidStr, &PortGid); + DevicePathLibStrToGuid (GuidStr, &PortGid); CopyMem (InfiniBand->PortGid, &PortGid, sizeof (EFI_GUID)); Strtoi64 (SidStr, &InfiniBand->ServiceId); Strtoi64 (TidStr, &InfiniBand->TargetPortId); @@ -2976,7 +2976,7 @@ DevPathFromTextHD ( Hd->SignatureType =3D SIGNATURE_TYPE_GUID; Hd->MBRType =3D 0x02; =20 - StrToGuid (SignatureStr, &SignatureGuid); + DevicePathLibStrToGuid (SignatureStr, &SignatureGuid); CopyMem (Hd->Signature, &SignatureGuid, sizeof (EFI_GUID)); } else { Hd->SignatureType =3D (UINT8) Strtoi (TypeStr); @@ -3091,7 +3091,7 @@ DevPathFromTextMedia ( (UINT16) sizeof (MEDIA_PROTOC= OL_DEVICE_PATH) ); =20 - StrToGuid (GuidStr, &Media->Protocol); + DevicePathLibStrToGuid (GuidStr, &Media->Protocol); =20 return (EFI_DEVICE_PATH_PROTOCOL *) Media; } @@ -3119,7 +3119,7 @@ DevPathFromTextFv ( (UINT16) sizeof (MEDIA_FW_VOL_D= EVICE_PATH) ); =20 - StrToGuid (GuidStr, &Fv->FvName); + DevicePathLibStrToGuid (GuidStr, &Fv->FvName); =20 return (EFI_DEVICE_PATH_PROTOCOL *) Fv; } @@ -3147,7 +3147,7 @@ DevPathFromTextFvFile ( (UINT16) sizeof (MEDIA= _FW_VOL_FILEPATH_DEVICE_PATH) ); =20 - StrToGuid (GuidStr, &FvFile->FvFileName); + DevicePathLibStrToGuid (GuidStr, &FvFile->FvFileName); =20 return (EFI_DEVICE_PATH_PROTOCOL *) FvFile; } @@ -3219,7 +3219,7 @@ DevPathFromTextRamDisk ( Strtoi64 (EndingAddrStr, &EndingAddr); WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr); RamDisk->Instance =3D (UINT16) Strtoi (InstanceStr); - StrToGuid (TypeGuidStr, &RamDisk->TypeGuid); + DevicePathLibStrToGuid (TypeGuidStr, &RamDisk->TypeGuid); =20 return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk; } --=20 2.9.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel