From: Laszlo Ersek <lersek@redhat.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
edk2-devel@ml01.01.org, leif.lindholm@linaro.org
Cc: ryan.harkin@linaro.org
Subject: Re: [PATCH v2 1/2] ArmPlatformPkg/ArmVExpressFastBootDxe: eliminate deprecated string functions
Date: Fri, 28 Oct 2016 16:23:03 +0200 [thread overview]
Message-ID: <ecdda4c7-b2d7-c51a-7d71-38991c49352a@redhat.com> (raw)
In-Reply-To: <1477651721-16958-2-git-send-email-ard.biesheuvel@linaro.org>
On 10/28/16 12:48, Ard Biesheuvel wrote:
> Get rid of functions that are no longer available when defining
> DISABLE_NEW_DEPRECATED_INTERFACES
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
> index 4d0811cc5eaf..64b25f8a8c45 100644
> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
> @@ -269,7 +269,7 @@ ArmFastbootPlatformInit (
>
> // Copy handle and partition name
> Entry->PartitionHandle = AllHandles[LoopIndex];
> - StrnCpy (
> + CopyMem (
> Entry->PartitionName,
> PartitionEntries[PartitionNode->PartitionNumber - 1].PartitionName, // Partition numbers start from 1.
> PARTITION_NAME_MAX_LENGTH
> @@ -320,7 +320,8 @@ ArmFastbootPlatformFlashPartition (
> CHAR16 PartitionNameUnicode[60];
> BOOLEAN PartitionFound;
>
> - AsciiStrToUnicodeStr (PartitionName, PartitionNameUnicode);
> + AsciiStrToUnicodeStrS (PartitionName, PartitionNameUnicode,
> + ARRAY_SIZE (PartitionNameUnicode));
Congratulations on the first genuine use of the now-central ARRAY_SIZE()
macro! :)
>
> PartitionFound = FALSE;
> Entry = (FASTBOOT_PARTITION_LIST *) GetFirstNode (&(mPartitionListHead));
> @@ -396,7 +397,7 @@ ArmFastbootPlatformGetVar (
> )
> {
> if (AsciiStrCmp (Name, "product")) {
> - AsciiStrCpy (Value, FixedPcdGetPtr (PcdFirmwareVendor));
> + AsciiStrCpyS (Value, 61, FixedPcdGetPtr (PcdFirmwareVendor));
> } else {
> *Value = '\0';
> }
Right.
> @@ -410,7 +411,7 @@ ArmFastbootPlatformOemCommand (
> {
> CHAR16 CommandUnicode[65];
>
> - AsciiStrToUnicodeStr (Command, CommandUnicode);
> + AsciiStrToUnicodeStrS (Command, CommandUnicode, ARRAY_SIZE (CommandUnicode));
>
> if (AsciiStrCmp (Command, "Demonstrate") == 0) {
> DEBUG ((EFI_D_ERROR, "ARM OEM Fastboot command 'Demonstrate' received.\n"));
>
I knew ARRAY_SIZE() would be especially useful with these "safe string"
functions! :)
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
next prev parent reply other threads:[~2016-10-28 14:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 10:48 [PATCH v2 0/2] ArmPlatformPkg: remove deprecated string function calls Ard Biesheuvel
2016-10-28 10:48 ` [PATCH v2 1/2] ArmPlatformPkg/ArmVExpressFastBootDxe: eliminate deprecated string functions Ard Biesheuvel
2016-10-28 14:23 ` Laszlo Ersek [this message]
2016-10-28 14:48 ` Leif Lindholm
2016-10-28 15:02 ` Ard Biesheuvel
2016-10-28 15:08 ` Laszlo Ersek
2016-10-28 15:13 ` Leif Lindholm
2016-10-28 15:14 ` Ard Biesheuvel
2016-10-28 15:26 ` Leif Lindholm
2016-10-28 10:48 ` [PATCH v2 2/2] ArmPlatformPkg/BootMonFs: " Ard Biesheuvel
2016-10-28 14:33 ` Laszlo Ersek
2016-10-28 14:52 ` Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ecdda4c7-b2d7-c51a-7d71-38991c49352a@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox