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

3 files changed, 85 insertions, 94 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.<BR>

+Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>

 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.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 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 <Library/LanguageLib.h>

 

 /**

-  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.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 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 <Library/LanguageLib.h>

 

 /**

-  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.