From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 9906182237 for ; Tue, 21 Feb 2017 20:50:53 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 20:50:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,192,1484035200"; d="scan'208";a="1100867140" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by orsmga001.jf.intel.com with ESMTP; 21 Feb 2017 20:50:52 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Jiewen Yao Date: Wed, 22 Feb 2017 12:50:39 +0800 Message-Id: <20170222045047.558308-4-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20170222045047.558308-1-ruiyu.ni@intel.com> References: <20170222045047.558308-1-ruiyu.ni@intel.com> Subject: [PATCH 03/11] SignedCapsulePkg/IniParsing: 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: , X-List-Received-Date: Wed, 22 Feb 2017 04:50:53 -0000 Since the next patch will add AsciiStrToGuid in BaseLib, renaming the internal function AsciiStrToGuid to IniAsciiStrToGuid to avoid link failure. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Jiewen Yao --- SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c index 270380e..16e1349 100644 --- a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c +++ b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c @@ -25,7 +25,7 @@ OpenIniFile(), PreProcessDataFile(), ProfileGetSection(), ProfileGetEntry() will receive untrusted input and do basic validation. - Copyright (c) 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -933,7 +933,7 @@ AsciiStrToBuf ( **/ EFI_STATUS -AsciiStrToGuid ( +IniAsciiStrToGuid ( IN CHAR8 *Str, OUT EFI_GUID *Guid ) @@ -1261,7 +1261,7 @@ GetGuidFromDataFile ( if (!IsValidGuid(Value, AsciiStrLen(Value))) { return EFI_NOT_FOUND; } - Status = AsciiStrToGuid(Value, Guid); + Status = IniAsciiStrToGuid(Value, Guid); if (EFI_ERROR (Status)) { return EFI_NOT_FOUND; } -- 2.9.0.windows.1