From 573d7e468eb83505a20ae3f828b67599cda23b3d Mon Sep 17 00:00:00 2001 From: jcarsey Date: Mon, 8 Aug 2011 18:22:08 +0000 Subject: [PATCH] remove CatSPrint from ShellPkg. signed-off-by: jcarsey reviewed-by: lgrosenb git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12100 6f19259b-4bc3-4df7-8a09-765794883524 --- .../UefiShellDebug1CommandsLib.c | 46 ------------------- .../UefiShellDebug1CommandsLib.h | 31 ------------- 2 files changed, 77 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c index 13c829afb5..f3cc8d9ce9 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c @@ -368,52 +368,6 @@ ConvertStringToGuid ( return (EFI_SUCCESS); } -CHAR16 TempBufferCatSPrint[1000]; -/** - Appends a formatted Unicode string to a Null-terminated Unicode string - - This function appends a formatted Unicode string to the Null-terminated - Unicode string specified by String. String is optional and may be NULL. - Storage for the formatted Unicode string returned is allocated using - AllocateZeroPool(). The pointer to the appended string is returned. The caller - is responsible for freeing the returned string. - - If String is not NULL and not aligned on a 16-bit boundary, then ASSERT(). - If Format is NULL, then ASSERT(). - If Format is not aligned on a 16-bit boundary, then ASSERT(). - - @param String A null-terminated Unicode string. - @param FormatString A null-terminated Unicode format string. - @param ... The variable argument list whose contents are accessed based - on the format string specified by Format. - - @retval NULL There was not enough available memory. - @return Null terminated Unicode string is that is the formatted - string appended to String. - @sa CatVSPrint -**/ -CHAR16* -EFIAPI -CatSPrint ( - IN CONST CHAR16 *String OPTIONAL, - IN CONST CHAR16 *FormatString, - ... - ) -{ - VA_LIST Marker; - UINTN StringLength; - if (String != NULL) { - StrCpy(TempBufferCatSPrint, String); - } else { - *TempBufferCatSPrint = CHAR_NULL; - } - VA_START (Marker, FormatString); - StringLength = StrLen(TempBufferCatSPrint); - - UnicodeVSPrint(TempBufferCatSPrint+StrLen(TempBufferCatSPrint), 1000-StringLength, FormatString, Marker); - return (AllocateCopyPool(StrSize(TempBufferCatSPrint), TempBufferCatSPrint)); -} - /** Clear the line at the specified Row. diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h index 3967768d1a..3db03c8fab 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h @@ -361,37 +361,6 @@ ShellCommandRunHexEdit ( IN EFI_SYSTEM_TABLE *SystemTable ); -/** - Appends a formatted Unicode string to a Null-terminated Unicode string - - This function appends a formatted Unicode string to the Null-terminated - Unicode string specified by String. String is optional and may be NULL. - Storage for the formatted Unicode string returned is allocated using - AllocateZeroPool(). The pointer to the appended string is returned. The caller - is responsible for freeing the returned string. - - If String is not NULL and not aligned on a 16-bit boundary, then ASSERT(). - If Format is NULL, then ASSERT(). - If Format is not aligned on a 16-bit boundary, then ASSERT(). - - @param String A null-terminated Unicode string. - @param FormatString A null-terminated Unicode format string. - @param ... The variable argument list whose contents are accessed based - on the format string specified by Format. - - @retval NULL There was not enough available memory. - @return Null terminated Unicode string is that is the formatted - string appended to String. - @sa CatVSPrint -**/ -CHAR16* -EFIAPI -CatSPrint ( - IN CONST CHAR16 *String OPTIONAL, - IN CONST CHAR16 *FormatString, - ... - ); - /** Clear the line at the specified Row.