Replace references to RFC 3066 with RFC 4646.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / HiiDatabase.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
index 74ddad0130ceff988595a8932aa29950c6307d13..a25650d8d7bf962490e9108d1bdcdb9299f7e8a1 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
@@ -306,8 +306,8 @@ HiiFindHandles (
 }\r
 \r
 EFI_STATUS\r
-LangCodes3066To639 (\r
-  IN CHAR8 *LangCodes3066,\r
+LangCodes4646To639 (\r
+  IN CHAR8 *LangCodes4646,\r
   IN CHAR8 **LangCodes639\r
   )\r
 {\r
@@ -317,22 +317,22 @@ LangCodes3066To639 (
   UINTN                      Count;\r
   EFI_STATUS                 Status;\r
 \r
-  ASSERT (LangCodes3066 != NULL);\r
+  ASSERT (LangCodes4646 != NULL);\r
   ASSERT (LangCodes639 != NULL);\r
   \r
   //\r
-  // Allocate working buffer to contain substring of LangCodes3066.\r
+  // Allocate working buffer to contain substring of LangCodes4646.\r
   //\r
-  Lang = AllocatePool (AsciiStrSize (LangCodes3066));\r
+  Lang = AllocatePool (AsciiStrSize (LangCodes4646));\r
   if (Lang == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   //\r
-  // Count the number of RFC 3066 language codes.\r
+  // Count the number of RFC 4646 language codes.\r
   //\r
   Index = 0;\r
-  AsciiLangCodes = LangCodes3066;\r
+  AsciiLangCodes = LangCodes4646;\r
   while (AsciiStrLen (AsciiLangCodes) != 0) {\r
     GetNextLanguage (&AsciiLangCodes, Lang);\r
     Index++;\r
@@ -349,11 +349,11 @@ LangCodes3066To639 (
     goto Done;\r
   }\r
 \r
-  AsciiLangCodes = LangCodes3066;\r
+  AsciiLangCodes = LangCodes4646;\r
 \r
   for (Index = 0; Index < Count; Index++) {\r
     GetNextLanguage (&AsciiLangCodes, Lang);\r
-    Status = ConvertRfc3066LanguageToIso639Language (Lang, *LangCodes639 + Index * ISO_639_2_ENTRY_SIZE);\r
+    Status = ConvertRfc4646LanguageToIso639Language (Lang, *LangCodes639 + Index * ISO_639_2_ENTRY_SIZE);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
@@ -391,7 +391,7 @@ HiiGetPrimaryLanguages (
 {\r
   HII_THUNK_PRIVATE_DATA     *Private;\r
   EFI_HII_HANDLE             UefiHiiHandle;\r
-  CHAR8                      *LangCodes3066;\r
+  CHAR8                      *LangCodes4646;\r
   CHAR16                     *UnicodeLangCodes639;\r
   CHAR8                      *LangCodes639;\r
   EFI_STATUS                 Status;\r
@@ -403,15 +403,15 @@ HiiGetPrimaryLanguages (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  LangCodes3066 = HiiGetSupportedLanguages (UefiHiiHandle);\r
+  LangCodes4646 = HiiGetSupportedLanguages (UefiHiiHandle);\r
 \r
-  if (LangCodes3066 == NULL) {\r
+  if (LangCodes4646 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
 \r
   LangCodes639 = NULL;\r
-  Status = LangCodes3066To639 (LangCodes3066, &LangCodes639);\r
+  Status = LangCodes4646To639 (LangCodes4646, &LangCodes639);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -429,7 +429,7 @@ HiiGetPrimaryLanguages (
   *LanguageString = UnicodeLangCodes639;\r
 \r
 Done:\r
-  FreePool (LangCodes3066);\r
+  FreePool (LangCodes4646);\r
   if (LangCodes639 != NULL) {\r
     FreePool (LangCodes639);\r
   }\r
@@ -524,9 +524,9 @@ HiiGetSecondaryLanguages (
 {\r
   HII_THUNK_PRIVATE_DATA     *Private;\r
   EFI_HII_HANDLE             UefiHiiHandle;\r
-  CHAR8                      *PrimaryLang3066;\r
+  CHAR8                      *PrimaryLang4646;\r
   CHAR8                      *PrimaryLang639;\r
-  CHAR8                      *SecLangCodes3066;\r
+  CHAR8                      *SecLangCodes4646;\r
   CHAR8                      *SecLangCodes639;\r
   CHAR16                     *UnicodeSecLangCodes639;\r
   EFI_STATUS                 Status;\r
@@ -534,8 +534,8 @@ HiiGetSecondaryLanguages (
   Private = HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
 \r
   SecLangCodes639        = NULL;\r
-  SecLangCodes3066       = NULL;\r
-  PrimaryLang3066        = NULL;\r
+  SecLangCodes4646       = NULL;\r
+  PrimaryLang4646        = NULL;\r
   UnicodeSecLangCodes639 = NULL;\r
 \r
   UefiHiiHandle = FwHiiHandleToUefiHiiHandle (Private, Handle);\r
@@ -551,17 +551,17 @@ HiiGetSecondaryLanguages (
 \r
   UnicodeStrToAsciiStr (PrimaryLanguage, PrimaryLang639);\r
 \r
-  PrimaryLang3066 = ConvertIso639LanguageToRfc3066Language (PrimaryLang639);\r
-  ASSERT_EFI_ERROR (PrimaryLang3066 != NULL);\r
+  PrimaryLang4646 = ConvertIso639LanguageToRfc4646Language (PrimaryLang639);\r
+  ASSERT_EFI_ERROR (PrimaryLang4646 != NULL);\r
 \r
-  SecLangCodes3066 = HiiGetSupportedSecondaryLanguages (UefiHiiHandle, PrimaryLang3066);\r
+  SecLangCodes4646 = HiiGetSupportedSecondaryLanguages (UefiHiiHandle, PrimaryLang4646);\r
 \r
-  if (SecLangCodes3066 == NULL) {\r
+  if (SecLangCodes4646 == NULL) {\r
     Status =  EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
 \r
-  Status = LangCodes3066To639 (SecLangCodes3066, &SecLangCodes639);\r
+  Status = LangCodes4646To639 (SecLangCodes4646, &SecLangCodes639);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -573,7 +573,7 @@ HiiGetSecondaryLanguages (
   }\r
 \r
   //\r
-  // The language returned is in RFC 3066 format.\r
+  // The language returned is in RFC 4646 format.\r
   //\r
   *LanguageString = AsciiStrToUnicodeStr (SecLangCodes639, UnicodeSecLangCodes639);\r
 \r
@@ -586,12 +586,12 @@ Done:
     FreePool (SecLangCodes639);\r
   }\r
 \r
-  if (PrimaryLang3066 != NULL) {\r
-    FreePool (PrimaryLang3066);\r
+  if (PrimaryLang4646 != NULL) {\r
+    FreePool (PrimaryLang4646);\r
   }\r
 \r
-  if (SecLangCodes3066 != NULL) {\r
-    FreePool (SecLangCodes3066);\r
+  if (SecLangCodes4646 != NULL) {\r
+    FreePool (SecLangCodes4646);\r
   }\r
   if (UnicodeSecLangCodes639 != NULL) {\r
     FreePool (UnicodeSecLangCodes639);\r