From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH 5/6] ArmPkg/BdsLib: eliminate calls to deprecated string functions
Date: Mon, 24 Oct 2016 17:06:45 +0100 [thread overview]
Message-ID: <1477325206-24646-6-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1477325206-24646-1-git-send-email-ard.biesheuvel@linaro.org>
Remove calls to deprecated string functions like AsciiStrCpy() and
UnicodeStrToAsciiStr()
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
ArmPkg/Library/BdsLib/BdsFilePath.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ArmPkg/Library/BdsLib/BdsFilePath.c b/ArmPkg/Library/BdsLib/BdsFilePath.c
index aefeaed4ffb5..351a8bd8edf4 100644
--- a/ArmPkg/Library/BdsLib/BdsFilePath.c
+++ b/ArmPkg/Library/BdsLib/BdsFilePath.c
@@ -964,7 +964,7 @@ Mtftp4CheckPacket (
Step = (Context->DownloadedNbOfBytes * TFTP_PROGRESS_SLIDER_STEPS) / Context->FileSize;
if (Step > LastStep) {
Print (mTftpProgressDelete);
- StrCpy (Progress, mTftpProgressFrame);
+ StrCpyS (Progress, sizeof (Progress), mTftpProgressFrame);
for (Index = 1; Index < Step; Index++) {
Progress[Index] = L'=';
}
@@ -1044,6 +1044,7 @@ BdsTftpLoadImage (
UINT64 FileSize;
UINT64 TftpBufferSize;
BDS_TFTP_CONTEXT *TftpContext;
+ UINTN PathNameLen;
ASSERT(IS_DEVICE_PATH_NODE (RemainingDevicePath, MESSAGING_DEVICE_PATH, MSG_IPv4_DP));
IPv4DevicePathNode = (IPv4_DEVICE_PATH*)RemainingDevicePath;
@@ -1187,8 +1188,9 @@ BdsTftpLoadImage (
// The Device Path might contain multiple FilePath nodes
PathName = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL*)(IPv4DevicePathNode + 1), FALSE, FALSE);
- AsciiFilePath = AllocatePool (StrLen (PathName) + 1);
- UnicodeStrToAsciiStr (PathName, AsciiFilePath);
+ PathNameLen = StrLen (PathName) + 1;
+ AsciiFilePath = AllocatePool (PathNameLen);
+ UnicodeStrToAsciiStrS (PathName, AsciiFilePath, PathNameLen);
//
// Try to get the size of the file in bytes from the server. If it fails,
--
2.7.4
next prev parent reply other threads:[~2016-10-24 16:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-24 16:06 [PATCH 0/6] ArmPkg: eliminate calls to deprecated functions Ard Biesheuvel
2016-10-24 16:06 ` [PATCH 1/6] ArmPkg: add missing components Ard Biesheuvel
2016-10-25 12:51 ` Leif Lindholm
2016-10-24 16:06 ` [PATCH 2/6] ArmPkg/ArmCortexA9Lib RVCT: remove incompatible GCC include Ard Biesheuvel
2016-10-25 12:53 ` Leif Lindholm
2016-10-24 16:06 ` [PATCH 3/6] ArmPkg/LinuxLoader: eliminate calls to deprecated string functions Ard Biesheuvel
2016-10-25 10:53 ` Laszlo Ersek
2016-10-25 10:56 ` Ard Biesheuvel
2016-10-25 11:08 ` Ryan Harkin
2016-10-25 11:09 ` Ard Biesheuvel
2016-10-24 16:06 ` [PATCH 4/6] ArmPkg/SemihostFs: " Ard Biesheuvel
2016-10-25 11:11 ` Laszlo Ersek
2016-10-24 16:06 ` Ard Biesheuvel [this message]
2016-10-25 11:16 ` [PATCH 5/6] ArmPkg/BdsLib: " Laszlo Ersek
2016-10-24 16:06 ` [PATCH 6/6] ArmPkg: enable -DDISABLE_NEW_DEPRECATED_INTERFACES Ard Biesheuvel
2016-10-25 11:17 ` Laszlo Ersek
2016-10-25 11:32 ` [PATCH 0/6] ArmPkg: eliminate calls to deprecated functions Ryan Harkin
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=1477325206-24646-6-git-send-email-ard.biesheuvel@linaro.org \
--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