[edk2] [PATCH v2 03/11] SignedCapsulePkg/IniParsing: Rename StrToGuid to avoid link failure

Ruiyu Ni posted 11 patches 7 years, 8 months ago
[edk2] [PATCH v2 03/11] SignedCapsulePkg/IniParsing: Rename StrToGuid to avoid link failure
Posted by Ruiyu Ni 7 years, 8 months ago
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 <ruiyu.ni@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
---
 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.<BR>
+  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
 
   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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2 03/11] SignedCapsulePkg/IniParsing: Rename StrToGuid to avoid link failure
Posted by Yao, Jiewen 7 years, 8 months ago
Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Monday, February 27, 2017 3:23 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH v2 03/11] SignedCapsulePkg/IniParsing: Rename StrToGuid to
> avoid link failure
> 
> 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 <ruiyu.ni@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> ---
>  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.<BR>
> +  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
> 
>    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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel