1. Patchew
  2. EDK2
  3. [edk2] [PATCH 0/7] Mark [Ascii|Unicode]ValueToString as deprecated
  4. View patch

[edk2] [PATCH 4/7] SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString

Hao Wu posted 7 patches 7 years, 8 months ago
[edk2] [PATCH 4/7] SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString
Posted by Hao Wu 7 years, 8 months ago 
It is the follow up of commits 51f0ceb..9e32e97 to replace
AsciiValueToString/UnicodeValueToString with
AsciiValueToStringS/UnicodeValueToStringS.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c | 10 ++++++++--
 SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c  | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c
index fef1daf..204fd53 100644
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c
@@ -2,7 +2,7 @@
   Parse the INI configuration file and pass the information to the recovery driver
   so that the driver can perform recovery accordingly.
 
-  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
@@ -85,7 +85,13 @@ ParseRecoveryDataFile (
     // Get the section name of each update
     //
     AsciiStrCpyS (Entry, MAX_LINE_LENGTH, "Recovery");
-    AsciiValueToString(Entry + AsciiStrLen(Entry), 0, Index, 0);
+    AsciiValueToStringS (
+      Entry + AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
+      MAX_LINE_LENGTH - AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
+      0,
+      Index,
+      0
+      );
     Status = GetStringFromDataFile(
                Context,
                "Head",
diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c
index dcad762..67584c6 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c
@@ -2,7 +2,7 @@
   Parse the INI configuration file and pass the information to the update driver
   so that the driver can perform update accordingly.
 
-  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
@@ -86,7 +86,13 @@ ParseUpdateDataFile (
     // Get the section name of each update
     //
     AsciiStrCpyS (Entry, MAX_LINE_LENGTH, "Update");
-    AsciiValueToString(Entry + AsciiStrLen(Entry), 0, Index, 0);
+    AsciiValueToStringS (
+      Entry + AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
+      MAX_LINE_LENGTH - AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
+      0,
+      Index,
+      0
+      );
     Status = GetStringFromDataFile(
                Context,
                "Head",
-- 
1.9.5.msysgit.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH 4/7] SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString
Posted by Yao, Jiewen 7 years, 8 months ago 
Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Wu, Hao A
> Sent: Tuesday, February 21, 2017 7:36 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH 4/7] SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString
> 
> It is the follow up of commits 51f0ceb..9e32e97 to replace
> AsciiValueToString/UnicodeValueToString with
> AsciiValueToStringS/UnicodeValueToStringS.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
>  SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c |
> 10 ++++++++--
>  SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c  |
> 10 ++++++++--
>  2 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git
> a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c
> b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c
> index fef1daf..204fd53 100644
> --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c
> +++
> b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c
> @@ -2,7 +2,7 @@
>    Parse the INI configuration file and pass the information to the recovery
> driver
>    so that the driver can perform recovery accordingly.
> 
> -  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
> @@ -85,7 +85,13 @@ ParseRecoveryDataFile (
>      // Get the section name of each update
>      //
>      AsciiStrCpyS (Entry, MAX_LINE_LENGTH, "Recovery");
> -    AsciiValueToString(Entry + AsciiStrLen(Entry), 0, Index, 0);
> +    AsciiValueToStringS (
> +      Entry + AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
> +      MAX_LINE_LENGTH - AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
> +      0,
> +      Index,
> +      0
> +      );
>      Status = GetStringFromDataFile(
>                 Context,
>                 "Head",
> diff --git
> a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c
> b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c
> index dcad762..67584c6 100644
> --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c
> +++
> b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c
> @@ -2,7 +2,7 @@
>    Parse the INI configuration file and pass the information to the update driver
>    so that the driver can perform update accordingly.
> 
> -  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
> @@ -86,7 +86,13 @@ ParseUpdateDataFile (
>      // Get the section name of each update
>      //
>      AsciiStrCpyS (Entry, MAX_LINE_LENGTH, "Update");
> -    AsciiValueToString(Entry + AsciiStrLen(Entry), 0, Index, 0);
> +    AsciiValueToStringS (
> +      Entry + AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
> +      MAX_LINE_LENGTH - AsciiStrnLenS (Entry, MAX_LINE_LENGTH),
> +      0,
> +      Index,
> +      0
> +      );
>      Status = GetStringFromDataFile(
>                 Context,
>                 "Head",
> --
> 1.9.5.msysgit.0

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

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.