sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: Replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr

Browse Source 
It is the follow up of 3ab41b7a32
to replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr with
UnicodeStrToAsciiStrS/AsciiStrToUnicodeStrS.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Star Zeng
2016-06-15 13:39:13 +08:00
parent b7c7179338
commit 46213c8eb4
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ShellPkg/Library/UefiDpLib/Dp.c
View File

@ -13,7 +13,7 @@
Dp uses this information to group records in different ways. It also uses Dp uses this information to group records in different ways. It also uses
timer information to calculate elapsed time for each measurement. timer information to calculate elapsed time for each measurement.
Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved. Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR> (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -168,6 +168,7 @@ ShellCommandRunDp (
BOOLEAN CumulativeMode; BOOLEAN CumulativeMode;
CONST CHAR16 *CustomCumulativeToken; CONST CHAR16 *CustomCumulativeToken;
PERF_CUM_DATA *CustomCumulativeData; PERF_CUM_DATA *CustomCumulativeData;
UINTN NameSize;
SHELL_STATUS ShellStatus; SHELL_STATUS ShellStatus;
StringPtr = NULL; StringPtr = NULL;
@ -263,8 +264,9 @@ ShellCommandRunDp (
CustomCumulativeData->MaxDur = 0; CustomCumulativeData->MaxDur = 0;
CustomCumulativeData->Count = 0; CustomCumulativeData->Count = 0;
CustomCumulativeData->Duration = 0; CustomCumulativeData->Duration = 0;
CustomCumulativeData->Name = AllocateZeroPool (StrLen (CustomCumulativeToken) + 1); NameSize = StrLen (CustomCumulativeToken) + 1;
UnicodeStrToAsciiStr (CustomCumulativeToken, CustomCumulativeData->Name); CustomCumulativeData->Name = AllocateZeroPool (NameSize);
UnicodeStrToAsciiStrS (CustomCumulativeToken, CustomCumulativeData->Name, NameSize);
} }
// //

10
ShellPkg/Library/UefiDpLib/DpTrace.c
View File

@ -220,8 +220,8 @@ DumpAllTrace(
++Count; // Count the number of records printed ++Count; // Count the number of records printed
// If Handle is non-zero, see if we can determine a name for the driver // If Handle is non-zero, see if we can determine a name for the driver
AsciiStrToUnicodeStr (Measurement.Module, mGaugeString); // Use Module by default AsciiStrToUnicodeStrS (Measurement.Module, mGaugeString, sizeof (mGaugeString) / sizeof (mGaugeString[0])); // Use Module by default
AsciiStrToUnicodeStr (Measurement.Token, mUnicodeToken); AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, sizeof (mUnicodeToken) / sizeof (mUnicodeToken[0]));
if (Measurement.Handle != NULL) { if (Measurement.Handle != NULL) {
// See if the Handle is in the HandleBuffer // See if the Handle is in the HandleBuffer
for (TIndex = 0; TIndex < HandleCount; TIndex++) { for (TIndex = 0; TIndex < HandleCount; TIndex++) {
@ -595,7 +595,7 @@ ProcessHandles(
continue; continue;
} }
mGaugeString[0] = 0; // Empty driver name by default mGaugeString[0] = 0; // Empty driver name by default
AsciiStrToUnicodeStr (Measurement.Token, mUnicodeToken); AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, sizeof (mUnicodeToken) / sizeof (mUnicodeToken[0]));
// See if the Handle is in the HandleBuffer // See if the Handle is in the HandleBuffer
for (Index = 0; Index < HandleCount; Index++) { for (Index = 0; Index < HandleCount; Index++) {
if (Measurement.Handle == HandleBuffer[Index]) { if (Measurement.Handle == HandleBuffer[Index]) {
@ -776,8 +776,8 @@ ProcessGlobal(
&Measurement.EndTimeStamp, &Measurement.EndTimeStamp,
&Measurement.Identifier)) != 0) &Measurement.Identifier)) != 0)
{ {
AsciiStrToUnicodeStr (Measurement.Module, mGaugeString); AsciiStrToUnicodeStrS (Measurement.Module, mGaugeString, sizeof (mGaugeString) / sizeof (mGaugeString[0]));
AsciiStrToUnicodeStr (Measurement.Token, mUnicodeToken); AsciiStrToUnicodeStrS (Measurement.Token, mUnicodeToken, sizeof (mUnicodeToken) / sizeof (mUnicodeToken[0]));
mGaugeString[25] = 0; mGaugeString[25] = 0;
mUnicodeToken[31] = 0; mUnicodeToken[31] = 0;
if ( ! ( IsPhase( &Measurement) || if ( ! ( IsPhase( &Measurement) ||

8
ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
View File

@ -272,6 +272,7 @@ ShellCommandRunTftp (
CONST CHAR16 *ValueStr; CONST CHAR16 *ValueStr;
CONST CHAR16 *RemoteFilePath; CONST CHAR16 *RemoteFilePath;
CHAR8 *AsciiRemoteFilePath; CHAR8 *AsciiRemoteFilePath;
UINTN FilePathSize;
CONST CHAR16 *Walker; CONST CHAR16 *Walker;
CONST CHAR16 *LocalFilePath; CONST CHAR16 *LocalFilePath;
EFI_MTFTP4_CONFIG_DATA Mtftp4ConfigData; EFI_MTFTP4_CONFIG_DATA Mtftp4ConfigData;
@ -358,14 +359,13 @@ ShellCommandRunTftp (
RemoteFilePath = ShellCommandLineGetRawValue (CheckPackage, 2); RemoteFilePath = ShellCommandLineGetRawValue (CheckPackage, 2);
ASSERT(RemoteFilePath != NULL); ASSERT(RemoteFilePath != NULL);
AsciiRemoteFilePath = AllocatePool ( FilePathSize = StrLen (RemoteFilePath) + 1;
(StrLen (RemoteFilePath) + 1) * sizeof (CHAR8) AsciiRemoteFilePath = AllocatePool (FilePathSize);
);
if (AsciiRemoteFilePath == NULL) { if (AsciiRemoteFilePath == NULL) {
ShellStatus = SHELL_OUT_OF_RESOURCES; ShellStatus = SHELL_OUT_OF_RESOURCES;
goto Error; goto Error;
} }
UnicodeStrToAsciiStr (RemoteFilePath, AsciiRemoteFilePath); UnicodeStrToAsciiStrS (RemoteFilePath, AsciiRemoteFilePath, FilePathSize);
if (ParamCount == 4) { if (ParamCount == 4) {
LocalFilePath = ShellCommandLineGetRawValue (CheckPackage, 3); LocalFilePath = ShellCommandLineGetRawValue (CheckPackage, 3);