\r
typedef struct {\r
CHAR8 *Iso639;\r
- CHAR8 *Rfc3066;\r
-} ISO639TORFC3066MAP;\r
+ CHAR8 *Rfc4646;\r
+} ISO639TORFC4646MAP;\r
\r
-ISO639TORFC3066MAP Iso639ToRfc3066Map [] = {\r
+ISO639TORFC4646MAP Iso639ToRfc4646Map [] = {\r
{"eng", "en-US"},\r
{"fra", "fr-FR"},\r
};\r
// Each entry is 5 CHAR8 values long. The first 3 CHAR8 values are the ISO 639-2 code.\r
// The last 2 CHAR8 values are the ISO 639-1 code.\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc3066ConversionTable[] =\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc4646ConversionTable[] =\r
"\\r
aaraa\\r
abkab\\r
";\r
\r
CHAR8 *\r
-ConvertIso639ToRfc3066 (\r
+ConvertIso639ToRfc4646 (\r
CHAR8 *Iso638Lang\r
)\r
{\r
}\r
}\r
\r
- for (Index = 0; Index < sizeof (Iso639ToRfc3066Map) / sizeof (Iso639ToRfc3066Map[0]); Index++) {\r
- if (AsciiStrnCmp (AsciiLanguage, Iso639ToRfc3066Map[Index].Iso639, AsciiStrSize (AsciiLanguage)) == 0) {\r
- return Iso639ToRfc3066Map[Index].Rfc3066;\r
+ for (Index = 0; Index < sizeof (Iso639ToRfc4646Map) / sizeof (Iso639ToRfc4646Map[0]); Index++) {\r
+ if (AsciiStrnCmp (AsciiLanguage, Iso639ToRfc4646Map[Index].Iso639, AsciiStrSize (AsciiLanguage)) == 0) {\r
+ return Iso639ToRfc4646Map[Index].Rfc4646;\r
}\r
}\r
\r
}\r
\r
/**\r
- Convert language code from RFC3066 to ISO639-2.\r
+ Convert language code from RFC4646 to ISO639-2.\r
\r
- @param LanguageRfc3066 RFC3066 language code.\r
+ @param LanguageRfc4646 RFC4646 language code.\r
@param LanguageIso639 ISO639-2 language code.\r
\r
@retval EFI_SUCCESS Language code converted.\r
**/\r
EFI_STATUS\r
EFIAPI\r
-ConvertRfc3066LanguageToIso639Language (\r
- IN CHAR8 *LanguageRfc3066,\r
+ConvertRfc4646LanguageToIso639Language (\r
+ IN CHAR8 *LanguageRfc4646,\r
OUT CHAR8 *LanguageIso639\r
)\r
{\r
UINTN Index;\r
\r
- if ((LanguageRfc3066[2] != '-') && (LanguageRfc3066[2] != 0)) {\r
- CopyMem (LanguageIso639, LanguageRfc3066, 3);\r
+ if ((LanguageRfc4646[2] != '-') && (LanguageRfc4646[2] != 0)) {\r
+ CopyMem (LanguageIso639, LanguageRfc4646, 3);\r
return EFI_SUCCESS;\r
}\r
\r
- for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {\r
- if (CompareMem (LanguageRfc3066, &Iso639ToRfc3066ConversionTable[Index + 3], 2) == 0) {\r
- CopyMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3);\r
+ for (Index = 0; Iso639ToRfc4646ConversionTable[Index] != 0; Index += 5) {\r
+ if (CompareMem (LanguageRfc4646, &Iso639ToRfc4646ConversionTable[Index + 3], 2) == 0) {\r
+ CopyMem (LanguageIso639, &Iso639ToRfc4646ConversionTable[Index], 3);\r
return EFI_SUCCESS;\r
}\r
}\r
\r
\r
/**\r
- Convert language code from ISO639-2 to RFC3066 and return the converted language.\r
+ Convert language code from ISO639-2 to RFC4646 and return the converted language.\r
Caller is responsible for freeing the allocated buffer.\r
\r
LanguageIso639 contain a single ISO639-2 code such as\r
"eng" or "fra".\r
\r
If LanguageIso639 is NULL, then ASSERT.\r
- If LanguageRfc3066 is NULL, then ASSERT.\r
+ If LanguageRfc4646 is NULL, then ASSERT.\r
\r
@param LanguageIso639 ISO639-2 language code.\r
\r
**/\r
CHAR8*\r
EFIAPI\r
-ConvertIso639LanguageToRfc3066Language (\r
+ConvertIso639LanguageToRfc4646Language (\r
IN CONST CHAR8 *LanguageIso639\r
)\r
{\r
UINTN Index;\r
- CHAR8 *Rfc3066Language;\r
+ CHAR8 *Rfc4646Language;\r
\r
- for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {\r
- if (CompareMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3) == 0) {\r
- Rfc3066Language = AllocateZeroPool (3);\r
- if (Rfc3066Language != NULL) {\r
- Rfc3066Language = CopyMem (Rfc3066Language, &Iso639ToRfc3066ConversionTable[Index + 3], 2);\r
+ for (Index = 0; Iso639ToRfc4646ConversionTable[Index] != 0; Index += 5) {\r
+ if (CompareMem (LanguageIso639, &Iso639ToRfc4646ConversionTable[Index], 3) == 0) {\r
+ Rfc4646Language = AllocateZeroPool (3);\r
+ if (Rfc4646Language != NULL) {\r
+ Rfc4646Language = CopyMem (Rfc4646Language, &Iso639ToRfc4646ConversionTable[Index + 3], 2);\r
}\r
- return Rfc3066Language;\r
+ return Rfc4646Language;\r
}\r
}\r
\r
Create or update the String given a new string and String ID.\r
\r
@param ThunkContext The Thunk Context.\r
- @param Rfc3066AsciiLanguage The RFC 3066 Language code in ASCII string format.\r
+ @param Rfc4646AsciiLanguage The RFC 4646 Language code in ASCII string format.\r
@param NewString The new string.\r
@param StringId The String ID. If StringId is 0, a new String Token\r
is created. Otherwise, the String Token StringId is \r
EFI_STATUS\r
UpdateString (\r
IN CONST HII_THUNK_CONTEXT *ThunkContext,\r
- IN CONST CHAR8 *Rfc3066AsciiLanguage,\r
+ IN CONST CHAR8 *Rfc4646AsciiLanguage,\r
IN CHAR16 *NewString,\r
IN OUT STRING_REF *StringId\r
)\r
{\r
EFI_STRING_ID NewStringId;\r
\r
- NewStringId = HiiSetString (ThunkContext->UefiHiiHandle, *StringId, NewString, Rfc3066AsciiLanguage);\r
+ NewStringId = HiiSetString (ThunkContext->UefiHiiHandle, *StringId, NewString, Rfc4646AsciiLanguage);\r
*StringId = NewStringId;\r
if (NewStringId == 0) {\r
//\r
EFI_STRING_ID LastStringId;\r
CHAR8 AsciiLanguage[ISO_639_2_ENTRY_SIZE + 1];\r
CHAR16 LanguageCopy[ISO_639_2_ENTRY_SIZE + 1];\r
- CHAR8 *Rfc3066AsciiLanguage;\r
+ CHAR8 *Rfc4646AsciiLanguage;\r
\r
LastStringId = (EFI_STRING_ID) 0;\r
StringId = (EFI_STRING_ID) 0;\r
- Rfc3066AsciiLanguage = NULL;\r
+ Rfc4646AsciiLanguage = NULL;\r
\r
if (Language != NULL) {\r
ZeroMem (AsciiLanguage, sizeof (AsciiLanguage));;\r
ZeroMem (LanguageCopy, sizeof (LanguageCopy));\r
CopyMem (LanguageCopy, Language, ISO_639_2_ENTRY_SIZE * sizeof (CHAR16));\r
UnicodeStrToAsciiStr (LanguageCopy, AsciiLanguage);\r
- Rfc3066AsciiLanguage = ConvertIso639ToRfc3066 (AsciiLanguage);\r
- ASSERT (Rfc3066AsciiLanguage != NULL);\r
+ Rfc4646AsciiLanguage = ConvertIso639ToRfc4646 (AsciiLanguage);\r
+ ASSERT (Rfc4646AsciiLanguage != NULL);\r
}\r
\r
Private = HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
if (CompareGuid (&TagGuid, &ThunkContext->TagGuid)) {\r
if (ThunkContext->SharingStringPack) {\r
StringId = *Reference;\r
- Status = UpdateString (ThunkContext, Rfc3066AsciiLanguage, NewString, &StringId);\r
+ Status = UpdateString (ThunkContext, Rfc4646AsciiLanguage, NewString, &StringId);\r
if (EFI_ERROR (Status)) {\r
break;\r
}\r
}\r
} else {\r
StringId = *Reference;\r
- Status = UpdateString (StringPackThunkContext, Rfc3066AsciiLanguage, NewString, &StringId);\r
+ Status = UpdateString (StringPackThunkContext, Rfc4646AsciiLanguage, NewString, &StringId);\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
{\r
HII_THUNK_PRIVATE_DATA *Private;\r
CHAR8 *Iso639AsciiLanguage;\r
- CHAR8 *Rfc3066AsciiLanguage;\r
+ CHAR8 *Rfc4646AsciiLanguage;\r
CHAR8 *SupportedLanguages;\r
CHAR8 *PlatformLanguage;\r
CHAR8 *BestLanguage;\r
Private = HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
\r
Iso639AsciiLanguage = NULL;\r
- Rfc3066AsciiLanguage = NULL;\r
+ Rfc4646AsciiLanguage = NULL;\r
\r
if (LanguageString != NULL) {\r
Iso639AsciiLanguage = AllocateZeroPool (StrLen (LanguageString) + 1);\r
\r
//\r
// Caller of Framework HII Interface uses the Language Identification String defined \r
- // in Iso639. So map it to the Language Identifier defined in RFC3066.\r
+ // in Iso639. So map it to the Language Identifier defined in RFC4646.\r
//\r
- Rfc3066AsciiLanguage = ConvertIso639ToRfc3066 (Iso639AsciiLanguage);\r
+ Rfc4646AsciiLanguage = ConvertIso639ToRfc4646 (Iso639AsciiLanguage);\r
\r
//\r
- // If Rfc3066AsciiLanguage is NULL, more language mapping must be added to \r
- // Iso639ToRfc3066Map.\r
+ // If Rfc4646AsciiLanguage is NULL, more language mapping must be added to \r
+ // Iso639ToRfc4646Map.\r
//\r
- ASSERT (Rfc3066AsciiLanguage != NULL);\r
+ ASSERT (Rfc4646AsciiLanguage != NULL);\r
\r
}\r
\r
goto Done;\r
}\r
\r
- if (Rfc3066AsciiLanguage == NULL) {\r
+ if (Rfc4646AsciiLanguage == NULL) {\r
//\r
// Get the languages that the package specified by HiiHandle supports\r
//\r
} else {\r
Status = mHiiStringProtocol->GetString (\r
mHiiStringProtocol,\r
- Rfc3066AsciiLanguage,\r
+ Rfc4646AsciiLanguage,\r
UefiHiiHandle,\r
Token,\r
StringBuffer,\r
projects / mirror_edk2.git / blobdiff