From 4f0779023cb4f633425a6fa8df747326336f2077 Mon Sep 17 00:00:00 2001 From: lzeng14 Date: Wed, 8 Jun 2011 05:53:18 +0000 Subject: [PATCH] String Reference Cleanup. Signed-off-by: lzeng14 Reviewed-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11762 6f19259b-4bc3-4df7-8a09-765794883524 --- .../FrameworkHiiOnUefiHiiThunk/HiiDatabase.c | 11 ++- .../Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c | 84 +++++++++---------- .../Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c | 84 +++++++++---------- .../EnglishDxe/UnicodeCollationEng.c | 44 +++++----- .../EnglishDxe/UnicodeCollationEng.h | 44 +++++----- .../Universal/HiiDatabaseDxe/HiiDatabase.h | 32 +++---- .../Universal/HiiDatabaseDxe/String.c | 30 ++++--- .../Network/IScsiDxe/IScsiInitiatorName.c | 8 +- .../Universal/Network/Mtftp4Dxe/Mtftp4Impl.c | 6 +- MdePkg/Include/Protocol/DevicePath.h | 2 +- MdePkg/Include/Protocol/FirmwareManagement.h | 12 +-- MdePkg/Include/Protocol/Ftp4.h | 4 +- MdePkg/Include/Protocol/HiiString.h | 33 ++++---- MdePkg/Include/Protocol/IScsiInitiatorName.h | 14 ++-- MdePkg/Include/Protocol/Ip6Config.h | 4 +- MdePkg/Include/Protocol/IpSecConfig.h | 6 +- MdePkg/Include/Protocol/Mtftp4.h | 10 +-- MdePkg/Include/Protocol/Mtftp6.h | 16 ++-- MdePkg/Include/Protocol/UnicodeCollation.h | 4 +- NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c | 6 +- NetworkPkg/Mtftp6Dxe/Mtftp6Impl.h | 6 +- 21 files changed, 228 insertions(+), 232 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c index 854d0ec451..5453c5a754 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c @@ -2,7 +2,7 @@ Framework to UEFI 2.1 HII Thunk. The driver consume UEFI HII protocols to produce a Framework HII protocol. -Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -386,7 +386,7 @@ Done: If not enough resource to complete the operation, then ASSERT. @param HiiHandle The HII package list handle. - @param FirstLanguage Pointer to language name buffer. + @param PrimaryLanguage Pointer to language name buffer. @return The supported languages. @@ -395,7 +395,7 @@ CHAR8 * EFIAPI HiiGetSupportedSecondaryLanguages ( IN EFI_HII_HANDLE HiiHandle, - IN CONST CHAR8 *FirstLanguage + IN CONST CHAR8 *PrimaryLanguage ) { EFI_STATUS Status; @@ -414,7 +414,7 @@ HiiGetSupportedSecondaryLanguages ( return NULL; } - Status = mHiiStringProtocol->GetSecondaryLanguages (mHiiStringProtocol, HiiHandle, FirstLanguage, LanguageString, &BufferSize); + Status = mHiiStringProtocol->GetSecondaryLanguages (mHiiStringProtocol, HiiHandle, PrimaryLanguage, LanguageString, &BufferSize); ASSERT (Status != EFI_NOT_FOUND); if (Status == EFI_BUFFER_TOO_SMALL) { @@ -424,7 +424,7 @@ HiiGetSupportedSecondaryLanguages ( return NULL; } - Status = mHiiStringProtocol->GetSecondaryLanguages (mHiiStringProtocol, HiiHandle, FirstLanguage, LanguageString, &BufferSize); + Status = mHiiStringProtocol->GetSecondaryLanguages (mHiiStringProtocol, HiiHandle, PrimaryLanguage, LanguageString, &BufferSize); } if (EFI_ERROR (Status)) { @@ -543,4 +543,3 @@ Done: return Status; } - diff --git a/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c b/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c index 422d55aebc..021f3e68f5 100644 --- a/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c +++ b/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c @@ -9,7 +9,7 @@ these two conditions are true: 1) EFI 1.10 module producing UC present 2) And the rest of modules on the platform consume UC2 -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -34,12 +34,11 @@ Module Name: #include /** - Performs a case-insensitive comparison of two Null-terminated Unicode - strings. + Performs a case-insensitive comparison of two Null-terminated strings. @param This Protocol instance pointer. - @param Str1 A pointer to a Null-terminated Unicode string. - @param Str2 A pointer to a Null-terminated Unicode string. + @param Str1 A pointer to a Null-terminated string. + @param Str2 A pointer to a Null-terminated string. @retval 0 Str1 is equivalent to Str2 @retval > 0 Str1 is lexically greater than Str2 @@ -55,11 +54,11 @@ StriColl ( ); /** - Converts all the Unicode characters in a Null-terminated Unicode string to - lower case Unicode characters. + Converts all the characters in a Null-terminated string to + lower case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -70,11 +69,11 @@ StrLwr ( ); /** - Converts all the Unicode characters in a Null-terminated Unicode string to upper - case Unicode characters. + Converts all the characters in a Null-terminated string to upper + case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -85,12 +84,12 @@ StrUpr ( ); /** - Performs a case-insensitive comparison of a Null-terminated Unicode - pattern string and a Null-terminated Unicode string. + Performs a case-insensitive comparison of a Null-terminated + pattern string and a Null-terminated string. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. - @param Pattern A pointer to a Null-terminated Unicode pattern string. + @param String A pointer to a Null-terminated string. + @param Pattern A pointer to a Null-terminated pattern string. @retval TRUE Pattern was found in String. @retval FALSE Pattern was not found in String. @@ -105,15 +104,14 @@ MetaiMatch ( ); /** - Converts an 8.3 FAT file name in an OEM character set to a Null-terminated - Unicode string. + Converts an 8.3 FAT file name in an OEM character set to a Null-terminated string. @param This Protocol instance pointer. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. **/ VOID @@ -126,12 +124,12 @@ FatToStr ( ); /** - Converts a Null-terminated Unicode string to legal characters in a FAT + Converts a Null-terminated string to legal characters in a FAT filename using an OEM character set. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. @@ -301,12 +299,11 @@ InitializeUC2 ( /** - Performs a case-insensitive comparison of two Null-terminated Unicode - strings. + Performs a case-insensitive comparison of two Null-terminated strings. @param This Protocol instance pointer. - @param Str1 A pointer to a Null-terminated Unicode string. - @param Str2 A pointer to a Null-terminated Unicode string. + @param Str1 A pointer to a Null-terminated string. + @param Str2 A pointer to a Null-terminated string. @retval 0 Str1 is equivalent to Str2 @retval > 0 Str1 is lexically greater than Str2 @@ -330,11 +327,11 @@ StriColl ( /** - Converts all the Unicode characters in a Null-terminated Unicode string to - lower case Unicode characters. + Converts all the characters in a Null-terminated string to + lower case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -353,11 +350,11 @@ StrLwr ( /** - Converts all the Unicode characters in a Null-terminated Unicode string to upper - case Unicode characters. + Converts all the characters in a Null-terminated string to upper + case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -375,12 +372,12 @@ StrUpr ( } /** - Performs a case-insensitive comparison of a Null-terminated Unicode - pattern string and a Null-terminated Unicode string. + Performs a case-insensitive comparison of a Null-terminated + pattern string and a Null-terminated string. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. - @param Pattern A pointer to a Null-terminated Unicode pattern string. + @param String A pointer to a Null-terminated string. + @param Pattern A pointer to a Null-terminated pattern string. @retval TRUE Pattern was found in String. @retval FALSE Pattern was not found in String. @@ -403,15 +400,14 @@ MetaiMatch ( /** - Converts an 8.3 FAT file name in an OEM character set to a Null-terminated - Unicode string. + Converts an 8.3 FAT file name in an OEM character set to a Null-terminated string. @param This Protocol instance pointer. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file - name using an OEM character set. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + name using an 8-bit OEM character set. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. **/ VOID @@ -432,12 +428,12 @@ FatToStr ( /** - Converts a Null-terminated Unicode string to legal characters in a FAT + Converts a Null-terminated string to legal characters in a FAT filename using an OEM character set. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. diff --git a/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c b/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c index bb863137f9..1a2c3914ef 100644 --- a/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c +++ b/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c @@ -9,7 +9,7 @@ these two conditions are true: 1) EFI 1.10 module consuming UC present 2) And the rest of modules on the platform produce UC2 -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -34,12 +34,11 @@ Module Name: #include /** - Performs a case-insensitive comparison of two Null-terminated Unicode - strings. + Performs a case-insensitive comparison of two Null-terminated strings. @param This Protocol instance pointer. - @param Str1 A pointer to a Null-terminated Unicode string. - @param Str2 A pointer to a Null-terminated Unicode string. + @param Str1 A pointer to a Null-terminated string. + @param Str2 A pointer to a Null-terminated string. @retval 0 Str1 is equivalent to Str2 @retval > 0 Str1 is lexically greater than Str2 @@ -55,11 +54,11 @@ StriColl ( ); /** - Converts all the Unicode characters in a Null-terminated Unicode string to - lower case Unicode characters. + Converts all the characters in a Null-terminated string to + lower case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -70,11 +69,11 @@ StrLwr ( ); /** - Converts all the Unicode characters in a Null-terminated Unicode string to upper - case Unicode characters. + Converts all the characters in a Null-terminated string to upper + case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -85,12 +84,12 @@ StrUpr ( ); /** - Performs a case-insensitive comparison of a Null-terminated Unicode - pattern string and a Null-terminated Unicode string. + Performs a case-insensitive comparison of a Null-terminated + pattern string and a Null-terminated string. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. - @param Pattern A pointer to a Null-terminated Unicode pattern string. + @param String A pointer to a Null-terminated string. + @param Pattern A pointer to a Null-terminated pattern string. @retval TRUE Pattern was found in String. @retval FALSE Pattern was not found in String. @@ -105,15 +104,14 @@ MetaiMatch ( ); /** - Converts an 8.3 FAT file name in an OEM character set to a Null-terminated - Unicode string. + Converts an 8.3 FAT file name in an OEM character set to a Null-terminated string. @param This Protocol instance pointer. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. **/ VOID @@ -126,12 +124,12 @@ FatToStr ( ); /** - Converts a Null-terminated Unicode string to legal characters in a FAT + Converts a Null-terminated string to legal characters in a FAT filename using an OEM character set. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. @@ -302,12 +300,11 @@ InitializeUC ( /** - Performs a case-insensitive comparison of two Null-terminated Unicode - strings. + Performs a case-insensitive comparison of two Null-terminated strings. @param This Protocol instance pointer. - @param Str1 A pointer to a Null-terminated Unicode string. - @param Str2 A pointer to a Null-terminated Unicode string. + @param Str1 A pointer to a Null-terminated string. + @param Str2 A pointer to a Null-terminated string. @retval 0 Str1 is equivalent to Str2 @retval > 0 Str1 is lexically greater than Str2 @@ -331,11 +328,11 @@ StriColl ( /** - Converts all the Unicode characters in a Null-terminated Unicode string to - lower case Unicode characters. + Converts all the characters in a Null-terminated string to + lower case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -354,11 +351,11 @@ StrLwr ( /** - Converts all the Unicode characters in a Null-terminated Unicode string to upper - case Unicode characters. + Converts all the characters in a Null-terminated string to upper + case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -376,12 +373,12 @@ StrUpr ( } /** - Performs a case-insensitive comparison of a Null-terminated Unicode - pattern string and a Null-terminated Unicode string. + Performs a case-insensitive comparison of a Null-terminated + pattern string and a Null-terminated string. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. - @param Pattern A pointer to a Null-terminated Unicode pattern string. + @param String A pointer to a Null-terminated string. + @param Pattern A pointer to a Null-terminated pattern string. @retval TRUE Pattern was found in String. @retval FALSE Pattern was not found in String. @@ -404,15 +401,14 @@ MetaiMatch ( /** - Converts an 8.3 FAT file name in an OEM character set to a Null-terminated - Unicode string. + Converts an 8.3 FAT file name in an OEM character set to a Null-terminated string. @param This Protocol instance pointer. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file - name using an OEM character set. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + name using an 8-bit OEM character set. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. **/ VOID @@ -433,12 +429,12 @@ FatToStr ( /** - Converts a Null-terminated Unicode string to legal characters in a FAT + Converts a Null-terminated string to legal characters in a FAT filename using an OEM character set. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c index 76d1ec7729..a37f5c923c 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c @@ -1,7 +1,7 @@ /** @file Driver to implement English version of Unicode Collation Protocol. -Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -171,12 +171,11 @@ InitializeUnicodeCollationEng ( /** - Performs a case-insensitive comparison of two Null-terminated Unicode - strings. + Performs a case-insensitive comparison of two Null-terminated strings. @param This Protocol instance pointer. - @param Str1 A pointer to a Null-terminated Unicode string. - @param Str2 A pointer to a Null-terminated Unicode string. + @param Str1 A pointer to a Null-terminated string. + @param Str2 A pointer to a Null-terminated string. @retval 0 Str1 is equivalent to Str2 @retval > 0 Str1 is lexically greater than Str2 @@ -205,11 +204,11 @@ EngStriColl ( /** - Converts all the Unicode characters in a Null-terminated Unicode string to - lower case Unicode characters. + Converts all the characters in a Null-terminated string to + lower case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -227,11 +226,11 @@ EngStrLwr ( /** - Converts all the Unicode characters in a Null-terminated Unicode string to upper - case Unicode characters. + Converts all the characters in a Null-terminated string to upper + case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -248,12 +247,12 @@ EngStrUpr ( } /** - Performs a case-insensitive comparison of a Null-terminated Unicode - pattern string and a Null-terminated Unicode string. + Performs a case-insensitive comparison of a Null-terminated + pattern string and a Null-terminated string. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. - @param Pattern A pointer to a Null-terminated Unicode pattern string. + @param String A pointer to a Null-terminated string. + @param Pattern A pointer to a Null-terminated pattern string. @retval TRUE Pattern was found in String. @retval FALSE Pattern was not found in String. @@ -385,15 +384,14 @@ EngMetaiMatch ( /** - Converts an 8.3 FAT file name in an OEM character set to a Null-terminated - Unicode string. + Converts an 8.3 FAT file name in an OEM character set to a Null-terminated string. @param This Protocol instance pointer. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file - name using an OEM character set. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + name using an 8-bit OEM character set. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. **/ VOID @@ -420,12 +418,12 @@ EngFatToStr ( /** - Converts a Null-terminated Unicode string to legal characters in a FAT + Converts a Null-terminated string to legal characters in a FAT filename using an OEM character set. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h index 3e1e1dca68..ac6dfc4033 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h @@ -1,7 +1,7 @@ /** @file Head file for Unicode Collation Protocol (English) -Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -50,12 +50,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // Prototypes // /** - Performs a case-insensitive comparison of two Null-terminated Unicode - strings. + Performs a case-insensitive comparison of two Null-terminated strings. @param This Protocol instance pointer. - @param Str1 A pointer to a Null-terminated Unicode string. - @param Str2 A pointer to a Null-terminated Unicode string. + @param Str1 A pointer to a Null-terminated string. + @param Str2 A pointer to a Null-terminated string. @retval 0 Str1 is equivalent to Str2 @retval > 0 Str1 is lexically greater than Str2 @@ -71,12 +70,12 @@ EngStriColl ( ); /** - Performs a case-insensitive comparison of a Null-terminated Unicode - pattern string and a Null-terminated Unicode string. + Performs a case-insensitive comparison of a Null-terminated + pattern string and a Null-terminated string. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. - @param Pattern A pointer to a Null-terminated Unicode pattern string. + @param String A pointer to a Null-terminated string. + @param Pattern A pointer to a Null-terminated pattern string. @retval TRUE Pattern was found in String. @retval FALSE Pattern was not found in String. @@ -91,11 +90,11 @@ EngMetaiMatch ( ); /** - Converts all the Unicode characters in a Null-terminated Unicode string to - lower case Unicode characters. + Converts all the characters in a Null-terminated string to + lower case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -106,11 +105,11 @@ EngStrLwr ( ); /** - Converts all the Unicode characters in a Null-terminated Unicode string to upper - case Unicode characters. + Converts all the characters in a Null-terminated string to upper + case characters. @param This Protocol instance pointer. - @param Str A pointer to a Null-terminated Unicode string. + @param Str A pointer to a Null-terminated string. **/ VOID @@ -121,15 +120,14 @@ EngStrUpr ( ); /** - Converts an 8.3 FAT file name in an OEM character set to a Null-terminated - Unicode string. + Converts an 8.3 FAT file name in an OEM character set to a Null-terminated string. @param This Protocol instance pointer. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file - name using an OEM character set. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + name using an 8-bit OEM character set. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. **/ VOID @@ -142,12 +140,12 @@ EngFatToStr ( ); /** - Converts a Null-terminated Unicode string to legal characters in a FAT + Converts a Null-terminated string to legal characters in a FAT filename using an OEM character set. @param This Protocol instance pointer. - @param String A pointer to a Null-terminated Unicode string. The string must - be preallocated to hold FatSize Unicode characters. + @param String A pointer to a Null-terminated string. The string must + be preallocated to hold FatSize characters. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file name using an OEM character set. diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h index d4f730abb8..1f6b888ec5 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h @@ -1060,7 +1060,8 @@ HiiSetString ( @param This A pointer to the EFI_HII_STRING_PROTOCOL instance. @param PackageList The package list to examine. - @param Languages Points to the buffer to hold the returned string. + @param Languages Points to the buffer to hold the returned + null-terminated ASCII string. @param LanguagesSize On entry, points to the size of the buffer pointed to by Languages, in bytes. On return, points to the length of Languages, in bytes. @@ -1092,25 +1093,28 @@ HiiGetLanguages ( @param This A pointer to the EFI_HII_STRING_PROTOCOL instance. @param PackageList The package list to examine. - @param FirstLanguage Points to the primary language. - @param SecondaryLanguages Points to the buffer to hold the returned list of - secondary languages for the specified - FirstLanguage. If there are no secondary - languages, the function returns successfully, + @param PrimaryLanguage Points to the null-terminated ASCII string that specifies + the primary language. Languages are specified in the + format specified in Appendix M of the UEFI 2.0 specification. + @param SecondaryLanguages Points to the buffer to hold the returned null-terminated + ASCII string that describes the list of + secondary languages for the specified + PrimaryLanguage. If there are no secondary + languages, the function returns successfully, but this is set to NULL. @param SecondaryLanguagesSize On entry, points to the size of the buffer - pointed to by SecondLanguages, in bytes. On - return, points to the length of SecondLanguages + pointed to by SecondaryLanguages, in bytes. On + return, points to the length of SecondaryLanguages in bytes. @retval EFI_SUCCESS Secondary languages were correctly returned. - @retval EFI_INVALID_PARAMETER FirstLanguage or SecondLanguages or - SecondLanguagesSize was NULL. - @retval EFI_BUFFER_TOO_SMALL The buffer specified by SecondLanguagesSize is + @retval EFI_INVALID_PARAMETER PrimaryLanguage or SecondaryLanguages or + SecondaryLanguagesSize was NULL. + @retval EFI_BUFFER_TOO_SMALL The buffer specified by SecondaryLanguagesSize is too small to hold the returned information. - SecondLanguageSize is updated to hold the size of + SecondaryLanguageSize is updated to hold the size of the buffer required. - @retval EFI_INVALID_LANGUAGE The language specified by FirstLanguage is not + @retval EFI_INVALID_LANGUAGE The language specified by PrimaryLanguage is not present in the specified package list. @retval EFI_NOT_FOUND The specified PackageList is not in the Database. @@ -1120,7 +1124,7 @@ EFIAPI HiiGetSecondaryLanguages ( IN CONST EFI_HII_STRING_PROTOCOL *This, IN EFI_HII_HANDLE PackageList, - IN CONST CHAR8 *FirstLanguage, + IN CONST CHAR8 *PrimaryLanguage, IN OUT CHAR8 *SecondaryLanguages, IN OUT UINTN *SecondaryLanguagesSize ); diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c index 92d0664856..bec8ce748c 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c @@ -1763,7 +1763,8 @@ HiiSetString ( @param This A pointer to the EFI_HII_STRING_PROTOCOL instance. @param PackageList The package list to examine. - @param Languages Points to the buffer to hold the returned string. + @param Languages Points to the buffer to hold the returned + null-terminated ASCII string. @param LanguagesSize On entry, points to the size of the buffer pointed to by Languages, in bytes. On return, points to the length of Languages, in bytes. @@ -1851,25 +1852,28 @@ HiiGetLanguages ( @param This A pointer to the EFI_HII_STRING_PROTOCOL instance. @param PackageList The package list to examine. - @param FirstLanguage Points to the primary language. - @param SecondaryLanguages Points to the buffer to hold the returned list of + @param PrimaryLanguage Points to the null-terminated ASCII string that specifies + the primary language. Languages are specified in the + format specified in Appendix M of the UEFI 2.0 specification. + @param SecondaryLanguages Points to the buffer to hold the returned null-terminated + ASCII string that describes the list of secondary languages for the specified - FirstLanguage. If there are no secondary - languages, the function returns successfully, but + PrimaryLanguage. If there are no secondary + languages, the function returns successfully, but this is set to NULL. @param SecondaryLanguagesSize On entry, points to the size of the buffer pointed - to by SecondaryLanguages, in bytes. On return, + to by SecondaryLanguages, in bytes. On return, points to the length of SecondaryLanguages in bytes. @retval EFI_SUCCESS Secondary languages were correctly returned. - @retval EFI_INVALID_PARAMETER FirstLanguage or SecondaryLanguages or + @retval EFI_INVALID_PARAMETER PrimaryLanguage or SecondaryLanguages or SecondaryLanguagesSize was NULL. @retval EFI_BUFFER_TOO_SMALL The buffer specified by SecondaryLanguagesSize is too small to hold the returned information. - SecondLanguageSize is updated to hold the size of + SecondaryLanguageSize is updated to hold the size of the buffer required. - @retval EFI_INVALID_LANGUAGE The language specified by FirstLanguage is not - present in the specified package list. + @retval EFI_INVALID_LANGUAGE The language specified by PrimaryLanguage is not + present in the specified package list. @retval EFI_NOT_FOUND The specified PackageList is not in the Database. **/ @@ -1878,7 +1882,7 @@ EFIAPI HiiGetSecondaryLanguages ( IN CONST EFI_HII_STRING_PROTOCOL *This, IN EFI_HII_HANDLE PackageList, - IN CONST CHAR8 *FirstLanguage, + IN CONST CHAR8 *PrimaryLanguage, IN OUT CHAR8 *SecondaryLanguages, IN OUT UINTN *SecondaryLanguagesSize ) @@ -1892,7 +1896,7 @@ HiiGetSecondaryLanguages ( CHAR8 *Languages; UINTN ResultSize; - if (This == NULL || PackageList == NULL || FirstLanguage == NULL) { + if (This == NULL || PackageList == NULL || PrimaryLanguage == NULL) { return EFI_INVALID_PARAMETER; } if (SecondaryLanguages == NULL || SecondaryLanguagesSize == NULL) { @@ -1923,7 +1927,7 @@ HiiGetSecondaryLanguages ( Link1 = Link1->ForwardLink ) { StringPackage = CR (Link1, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE); - if (HiiCompareLanguage (StringPackage->StringPkgHdr->Language, (CHAR8 *) FirstLanguage)) { + if (HiiCompareLanguage (StringPackage->StringPkgHdr->Language, (CHAR8 *) PrimaryLanguage)) { Languages = StringPackage->StringPkgHdr->Language; // // Language is a series of ';' terminated strings, first one is primary diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c index 5867935fa4..e753d9eebd 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c @@ -1,7 +1,7 @@ /** @file Implementation for EFI iSCSI Initiator Name Protocol. -Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -25,7 +25,8 @@ EFI_ISCSI_INITIATOR_NAME_PROTOCOL gIScsiInitiatorName = { @param[in] This Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. @param[in, out] BufferSize Size of the buffer in bytes pointed to by Buffer / Actual size of the variable data buffer. - @param[out] Buffer Pointer to the buffer for data to be read. + @param[out] Buffer Pointer to the buffer for data to be read. The data is a null-terminated UTF-8 encoded string. + The maximum length is 223 characters, including the null-terminator. @retval EFI_SUCCESS Data was successfully retrieved into the provided buffer and the BufferSize was sufficient to handle the iSCSI initiator name. @@ -64,7 +65,8 @@ IScsiGetInitiatorName ( @param[in] This Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. @param[in, out] BufferSize Size of the buffer in bytes pointed to by Buffer. - @param[in] Buffer Pointer to the buffer for data to be written. + @param[in] Buffer Pointer to the buffer for data to be written. The data is a null-terminated UTF-8 encoded string. + The maximum length is 223 characters, including the null-terminator. @retval EFI_SUCCESS Data was successfully stored by the protocol. @retval EFI_UNSUPPORTED Platform policies do not allow for data to be written. diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c index 5329e51863..3c68235d42 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c @@ -1,7 +1,7 @@ /** @file Interface routine for Mtftp4. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -936,8 +936,8 @@ EfiMtftp4ReadDirectory ( parameters. If NULL, the default parameters that were set in the EFI_MTFTP4_PROTOCOL.Configure() function are used - @param Filename Pointer to ASCIIZ file name string - @param ModeStr Pointer to ASCIIZ mode string. If NULL, "octet" + @param Filename Pointer to null-terminated ASCII file name string + @param ModeStr Pointer to null-terminated ASCII mode string. If NULL, "octet" will be used @param OptionCount Number of option/value string pairs in OptionList @param OptionList Pointer to array of option/value string pairs. diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h index 47518961f8..7a65f5e33a 100644 --- a/MdePkg/Include/Protocol/DevicePath.h +++ b/MdePkg/Include/Protocol/DevicePath.h @@ -965,7 +965,7 @@ typedef struct { /// UINT16 StatusFlag; /// - /// ASCIIZ string that describes the boot device to a user. + /// Null-terminated ASCII string that describes the boot device to a user. /// CHAR8 String[1]; } BBS_BBS_DEVICE_PATH; diff --git a/MdePkg/Include/Protocol/FirmwareManagement.h b/MdePkg/Include/Protocol/FirmwareManagement.h index 18f18fb4ba..617b96ab13 100644 --- a/MdePkg/Include/Protocol/FirmwareManagement.h +++ b/MdePkg/Include/Protocol/FirmwareManagement.h @@ -8,7 +8,7 @@ CheckImage(), GetPackageInfo(), and SetPackageInfo() shall return EFI_UNSUPPORTED if not supported by the driver. - Copyright (c) 2009, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -51,7 +51,7 @@ typedef struct { /// UINT64 ImageId; /// - /// A pointer to a null-terminated Unicode string representing the firmware image name. + /// A pointer to a null-terminated string representing the firmware image name. /// CHAR16 *ImageIdName; /// @@ -60,7 +60,7 @@ typedef struct { /// UINT32 Version; /// - /// A pointer to a null-terminated Unicode string representing the firmware image version name. + /// A pointer to a null-terminated string representing the firmware image version name. /// CHAR16 *VersionName; /// @@ -239,7 +239,7 @@ EFI_STATUS 0xFFFFFFFF. A value of 0xFFFFFFFE indicates that package version comparison is to be performed using PackageVersionName. A value of 0xFFFFFFFD indicates that package version update is in progress. - @param[out] PackageVersionName A pointer to a pointer to a null-terminated Unicode string representing the + @param[out] PackageVersionName A pointer to a pointer to a null-terminated string representing the package version name. The buffer is allocated by this function with AllocatePool(), and it is the caller's responsibility to free it with a call to FreePool(). @@ -330,7 +330,7 @@ EFI_STATUS @param[in] VendorCode This enables vendor to implement vendor-specific firmware image update policy. Null indicates the caller did not specify the policy or use the default policy. @param[in] Progress A function used by the driver to report the progress of the firmware update. - @param[out] AbortReason A pointer to a pointer to a null-terminated Unicode string providing more + @param[out] AbortReason A pointer to a pointer to a null-terminated string providing more details for the aborted operation. The buffer is allocated by this function with AllocatePool(), and it is the caller's responsibility to free it with a call to FreePool(). @@ -396,7 +396,7 @@ EFI_STATUS 0xFFFFFFFF. A value of 0xFFFFFFFE indicates that package version comparison is to be performed using PackageVersionName. A value of 0xFFFFFFFD indicates that package version update is in progress. - @param[out] PackageVersionName A pointer to a pointer to a null-terminated Unicode string representing + @param[out] PackageVersionName A pointer to a pointer to a null-terminated string representing the package version name. The buffer is allocated by this function with AllocatePool(), and it is the caller's responsibility to free it with a call to FreePool(). diff --git a/MdePkg/Include/Protocol/Ftp4.h b/MdePkg/Include/Protocol/Ftp4.h index ae437a8e99..1c4a5db925 100644 --- a/MdePkg/Include/Protocol/Ftp4.h +++ b/MdePkg/Include/Protocol/Ftp4.h @@ -7,7 +7,7 @@ The definitions in this file are defined in UEFI Specification 2.3, which have not been verified by one implementation yet. - Copyright (c) 2009, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -180,7 +180,7 @@ struct _EFI_FTP4_COMMAND_TOKEN { /// EFI_EVENT Event; /// - /// Pointer to an ASCIIZ path name string. + /// Pointer to a null-terminated ASCII name string. /// UINT8 *Pathname; /// diff --git a/MdePkg/Include/Protocol/HiiString.h b/MdePkg/Include/Protocol/HiiString.h index 3deeac033a..496ffa659e 100644 --- a/MdePkg/Include/Protocol/HiiString.h +++ b/MdePkg/Include/Protocol/HiiString.h @@ -1,7 +1,7 @@ /** @file The file provides services to manipulate string data. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at @@ -150,9 +150,10 @@ EFI_STATUS @param This A pointer to the EFI_HII_STRING_PROTOCOL instance. @param PackageList The package list to examine. - @param Languages Points to the buffer to hold the returned string. + @param Languages Points to the buffer to hold the returned + null-terminated ASCII string. @param LanguagesSize On entry, points to the size of the buffer pointed - to by Languages, in bytes. On return, points to + to by Languages, in bytes. On return, points to the length of Languages, in bytes. @retval EFI_SUCCESS The languages were returned successfully. @@ -181,24 +182,27 @@ EFI_STATUS @param This A pointer to the EFI_HII_STRING_PROTOCOL instance. @param PackageList The package list to examine. - @param FirstLanguage Points to the primary language. - @param SecondaryLanguages Points to the buffer to hold the returned list of + @param PrimaryLanguage Points to the null-terminated ASCII string that specifies + the primary language. Languages are specified in the + format specified in Appendix M of the UEFI 2.0 specification. + @param SecondaryLanguages Points to the buffer to hold the returned null-terminated + ASCII string that describes the list of secondary languages for the specified - FirstLanguage. If there are no secondary - languages, the function returns successfully, but + PrimaryLanguage. If there are no secondary + languages, the function returns successfully, but this is set to NULL. @param SecondaryLanguagesSize On entry, points to the size of the buffer pointed - to by SecondaryLanguages, in bytes. On return, + to by SecondaryLanguages, in bytes. On return, points to the length of SecondaryLanguages in bytes. @retval EFI_SUCCESS Secondary languages were correctly returned. - @retval EFI_INVALID_PARAMETER FirstLanguage or SecondaryLanguages or + @retval EFI_INVALID_PARAMETER PrimaryLanguage or SecondaryLanguages or SecondaryLanguagesSize was NULL. @retval EFI_BUFFER_TOO_SMALL The buffer specified by SecondaryLanguagesSize is too small to hold the returned information. - SecondLanguageSize is updated to hold the size of + SecondaryLanguageSize is updated to hold the size of the buffer required. - @retval EFI_INVALID_LANGUAGE The language specified by FirstLanguage is not + @retval EFI_INVALID_LANGUAGE The language specified by PrimaryLanguage is not present in the specified package list. @retval EFI_NOT_FOUND The specified PackageList is not in the Database. @@ -208,9 +212,9 @@ EFI_STATUS (EFIAPI *EFI_HII_GET_2ND_LANGUAGES)( IN CONST EFI_HII_STRING_PROTOCOL *This, IN EFI_HII_HANDLE PackageList, - IN CONST CHAR8 *FirstLanguage, - IN OUT CHAR8 *SecondLanguages, - IN OUT UINTN *SecondLanguagesSize + IN CONST CHAR8 *PrimaryLanguage, + IN OUT CHAR8 *SecondaryLanguages, + IN OUT UINTN *SecondaryLanguagesSize ); @@ -230,4 +234,3 @@ extern EFI_GUID gEfiHiiStringProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/IScsiInitiatorName.h b/MdePkg/Include/Protocol/IScsiInitiatorName.h index f7b890e2a6..e55c51b7c6 100644 --- a/MdePkg/Include/Protocol/IScsiInitiatorName.h +++ b/MdePkg/Include/Protocol/IScsiInitiatorName.h @@ -2,7 +2,7 @@ EFI_ISCSI_INITIATOR_NAME_PROTOCOL as defined in UEFI 2.0. It provides the ability to get and set the iSCSI Initiator Name. - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -29,7 +29,8 @@ typedef struct _EFI_ISCSI_INITIATOR_NAME_PROTOCOL EFI_ISCSI_INITIATOR_NAME_PROTO @param This Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. @param BufferSize Size of the buffer in bytes pointed to by Buffer / Actual size of the variable data buffer. - @param Buffer Pointer to the buffer for data to be read. + @param Buffer Pointer to the buffer for data to be read. The data is a null-terminated UTF-8 encoded string. + The maximum length is 223 characters, including the null-terminator. @retval EFI_SUCCESS Data was successfully retrieved into the provided buffer and the BufferSize was sufficient to handle the iSCSI initiator name @@ -53,7 +54,8 @@ EFI_STATUS @param This Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. @param BufferSize Size of the buffer in bytes pointed to by Buffer. - @param Buffer Pointer to the buffer for data to be written. + @param Buffer Pointer to the buffer for data to be written. The data is a null-terminated UTF-8 encoded string. + The maximum length is 223 characters, including the null-terminator. @retval EFI_SUCCESS Data was successfully stored by the protocol. @retval EFI_UNSUPPORTED Platform policies do not allow for data to be written. @@ -83,9 +85,3 @@ extern EFI_GUID gEfiIScsiInitiatorNameProtocolGuid; #endif - - - - - - diff --git a/MdePkg/Include/Protocol/Ip6Config.h b/MdePkg/Include/Protocol/Ip6Config.h index 7195ef6e57..b2c3be9ee7 100644 --- a/MdePkg/Include/Protocol/Ip6Config.h +++ b/MdePkg/Include/Protocol/Ip6Config.h @@ -2,7 +2,7 @@ This file provides a definition of the EFI IPv6 Configuration Protocol. -Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at
@@ -100,7 +100,7 @@ typedef enum { /// typedef struct { /// - /// The name of the interface. It is a NULL-terminated Unicode string. + /// The name of the interface. It is a NULL-terminated string. /// CHAR16 Name[32]; /// diff --git a/MdePkg/Include/Protocol/IpSecConfig.h b/MdePkg/Include/Protocol/IpSecConfig.h index e305381f7e..c6e2b36beb 100644 --- a/MdePkg/Include/Protocol/IpSecConfig.h +++ b/MdePkg/Include/Protocol/IpSecConfig.h @@ -3,7 +3,7 @@ The EFI_IPSEC_CONFIG_PROTOCOL provides the mechanism to set and retrieve security and policy related information for the EFI IPsec protocol driver. - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -331,7 +331,7 @@ typedef struct _EFI_IPSEC_SA_ID { /// typedef struct _EFI_IPSEC_SPD_DATA { /// - /// A null-terminated name string which is used as a symbolic + /// A null-terminated ASCII name string which is used as a symbolic /// identifier for an IPsec Local or Remote address. /// UINT8 Name[MAX_PEERID_LEN]; @@ -522,7 +522,7 @@ typedef struct _EFI_IPSEC_PAD_ID { /// EFI_IP_ADDRESS_INFO IpAddress; /// - /// Pointer to a null terminated string (8-bit ASCII character) + /// Pointer to a null terminated ASCII string /// representing the symbolic names. A PeerId can be a DNS /// name, Distinguished Name, RFC 822 email address or Key ID /// (specified in section 4.4.3.1 of RFC 4301) diff --git a/MdePkg/Include/Protocol/Mtftp4.h b/MdePkg/Include/Protocol/Mtftp4.h index 031ef184eb..1afac6cff5 100644 --- a/MdePkg/Include/Protocol/Mtftp4.h +++ b/MdePkg/Include/Protocol/Mtftp4.h @@ -1,7 +1,7 @@ /** @file EFI Multicast Trivial File Tranfer Protocol Definition -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at @@ -313,8 +313,8 @@ EFI_STATUS @param OverrideData Data that is used to override the existing parameters. If NULL, the default parameters that were set in the EFI_MTFTP4_PROTOCOL.Configure() function are used. - @param Filename The pointer to ASCIIZ file name string. - @param ModeStr The pointer to ASCIIZ mode string. If NULL, "octet" will be used. + @param Filename The pointer to null-terminated ASCII file name string. + @param ModeStr The pointer to null-terminated ASCII mode string. If NULL, "octet" will be used. @param OptionCount Number of option/value string pairs in OptionList. @param OptionList The pointer to array of option/value string pairs. Ignored if OptionCount is zero. @@ -542,11 +542,11 @@ struct _EFI_MTFTP4_TOKEN { /// EFI_MTFTP4_OVERRIDE_DATA *OverrideData; /// - /// The pointer to the ASCIIZ file name string. + /// The pointer to the null-terminated ASCII file name string. /// UINT8 *Filename; /// - /// The pointer to the ASCIIZ mode string. If NULL, "octet" is used. + /// The pointer to the null-terminated ASCII mode string. If NULL, "octet" is used. /// UINT8 *ModeStr; /// diff --git a/MdePkg/Include/Protocol/Mtftp6.h b/MdePkg/Include/Protocol/Mtftp6.h index b06a6719d5..b9836607ec 100644 --- a/MdePkg/Include/Protocol/Mtftp6.h +++ b/MdePkg/Include/Protocol/Mtftp6.h @@ -3,7 +3,7 @@ the EFI UDPv6 Protocol and provides basic services for client-side unicast and/or multicast TFTP operations. - Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -265,7 +265,7 @@ typedef struct { /// UINT8 SupportedOptionCount; /// - /// An array of option strings that are recognized and supported by + /// An array of null-terminated ASCII option strings that are recognized and supported by /// this EFI MTFTPv6 Protocol driver implementation. The buffer is /// read only to the caller and the caller should NOT free the buffer. /// @@ -304,8 +304,8 @@ typedef struct { /// EFI_MTFTP6_OPTION /// typedef struct { - UINT8 *OptionStr; ///< Pointer to the ASCIIZ MTFTPv6 option string. - UINT8 *ValueStr; ///< Pointer to the ASCIIZ MTFTPv6 value string. + UINT8 *OptionStr; ///< Pointer to the null-terminated ASCII MTFTPv6 option string. + UINT8 *ValueStr; ///< Pointer to the null-terminated ASCII MTFTPv6 value string. } EFI_MTFTP6_OPTION; /** @@ -409,11 +409,11 @@ struct _EFI_MTFTP6_TOKEN { /// EFI_MTFTP6_OVERRIDE_DATA *OverrideData; /// - /// Pointer to the ASCIIZ file name string. + /// Pointer to the null-terminated ASCII file name string. /// UINT8 *Filename; /// - /// Pointer to the ASCIIZ mode string. If NULL, octet is used. + /// Pointer to the null-terminated ASCII mode string. If NULL, octet is used. /// UINT8 *ModeStr; /// @@ -534,8 +534,8 @@ EFI_STATUS @param[in] OverrideData Data that is used to override the existing parameters. If NULL, the default parameters that were set in the EFI_MTFTP6_PROTOCOL.Configure() function are used. - @param[in] Filename Pointer to ASCIIZ file name string. - @param[in] ModeStr Pointer to ASCIIZ mode string. If NULL, octet will be used + @param[in] Filename Pointer to null-terminated ASCII file name string. + @param[in] ModeStr Pointer to null-terminated ASCII mode string. If NULL, octet will be used @param[in] OptionCount Number of option/value string pairs in OptionList. @param[in] OptionList Pointer to array of option/value string pairs. Ignored if OptionCount is zero. diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h index 1a79af6a39..f45c9ead0e 100644 --- a/MdePkg/Include/Protocol/UnicodeCollation.h +++ b/MdePkg/Include/Protocol/UnicodeCollation.h @@ -3,7 +3,7 @@ This protocol is used to allow code running in the boot services environment to perform lexical comparison functions on Unicode strings for given languages. -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at @@ -125,7 +125,7 @@ VOID @param This A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance. @param FatSize The size of the string Fat in bytes. @param Fat A pointer to a Null-terminated string that contains an 8.3 file - name using an OEM character set. + name using an 8-bit OEM character set. @param String A pointer to a Null-terminated string. The string must be allocated in advance to hold FatSize characters. diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c b/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c index fcbbf11134..79ae6e0741 100644 --- a/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c +++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c @@ -8,7 +8,7 @@ RFC2348 - TFTP Blocksize Option RFC2349 - TFTP Timeout Interval and Transfer Size Options - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -266,8 +266,8 @@ ON_EXIT: @param[in] OverrideData Data that is used to override the existing parameters. If NULL, the default parameters that were set in the EFI_MTFTP6_PROTOCOL.Configure() function are used. - @param[in] Filename Pointer to ASCIIZ file name string. - @param[in] ModeStr Pointer to ASCIIZ mode string. If NULL, octet will be used. + @param[in] Filename Pointer to null-terminated ASCII file name string. + @param[in] ModeStr Pointer to null-terminated ASCII mode string. If NULL, octet will be used. @param[in] OptionCount Number of option/value string pairs in OptionList. @param[in] OptionList Pointer to array of option/value string pairs. Ignored if OptionCount is zero. diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.h b/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.h index bf924a980c..626aea0e34 100644 --- a/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.h +++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Impl.h @@ -1,7 +1,7 @@ /** @file Mtftp6 internal data structure and definition declaration. - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -200,8 +200,8 @@ EfiMtftp6Configure ( @param[in] OverrideData Data that is used to override the existing parameters. If NULL, the default parameters that were set in the EFI_MTFTP6_PROTOCOL.Configure() function are used. - @param[in] Filename Pointer to ASCIIZ file name string. - @param[in] ModeStr Pointer to ASCIIZ mode string. If NULL, octet will be used + @param[in] Filename Pointer to null-terminated ASCII file name string. + @param[in] ModeStr Pointer to null-terminated ASCII mode string. If NULL, octet will be used @param[in] OptionCount Number of option/value string pairs in OptionList. @param[in] OptionList Pointer to array of option/value string pairs. Ignored if OptionCount is zero. -- 2.39.2