Re: [edk2-devel] [PATCH v1 1/1] MdePkg: UefiLib: Add a function to check if a language is supported

["Tom Zhao" <tzhao@solarflare.com>]

[-- Attachment #1: Type: text/plain, Size: 6069 bytes --]

Hi Liming

The function is only used inside UefiLib in the edk2 package, however, 
the intent was to use this in our UEFI implementation. I figured that 
others might find this functionality useful. The functions inside 
UefiLib were only modified for consistency.

Tom

On 21/08/2019 14:34, Liming Gao wrote:
>
> Tom:
>
>   Can you send the patch by the command ‘git send-email xxx.patch’? If 
> so, I can extract the patch from the mail.
>
>   If this function is only used in UefiLib, how about define it as the 
> internal function?
>
> Thanks
>
> Liming
>
> *From:*devel@edk2.groups.io [mailto:devel@edk2.groups.io] *On Behalf 
> Of *Tom Zhao
> *Sent:* Wednesday, August 21, 2019 6:23 PM
> *To:* devel@edk2.groups.io
> *Subject:* [edk2-devel] [PATCH v1 1/1] MdePkg: UefiLib: Add a function 
> to check if a language is supported
>
>
>
> -------- Forwarded Message --------
>
> *Subject: *
>
> 	
>
> [PATCH v1 1/1] MdePkg: UefiLib: Add a function to check if a language 
> is supported
>
> *Date: *
>
> 	
>
> Tue, 20 Aug 2019 17:13:19 +0100
>
> *From: *
>
> 	
>
> Tom Zhao <tzhao@solarflare.com> <mailto:tzhao@solarflare.com>
>
> *To: *
>
> 	
>
> edk2-devel@lists.01.org <mailto:edk2-devel@lists.01.org>
>
> *CC: *
>
> 	
>
> michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com>, 
> liming.gao@intel.com <mailto:liming.gao@intel.com>
>
>
>
> Add a function that checks if a target language is in the supported
> languages list. Add some calls to this function where appropriate in
> UefiLib.c
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com> 
> <mailto:michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com> <mailto:liming.gao@intel.com>
> Signed-off-by: Tom Zhao <tzhao@solarflare.com> 
> <mailto:tzhao@solarflare.com>
> ---
> MdePkg/Include/Library/UefiLib.h | 16 ++++++
> MdePkg/Library/UefiLib/UefiLib.c | 59 +++++++++++++-------
> 2 files changed, 54 insertions(+), 21 deletions(-)
>
> diff --git a/MdePkg/Include/Library/UefiLib.h 
> b/MdePkg/Include/Library/UefiLib.h
> index 1650f30ddbc6..9dd170cbe2bf 100644
> --- a/MdePkg/Include/Library/UefiLib.h
> +++ b/MdePkg/Include/Library/UefiLib.h
> @@ -461,6 +461,22 @@ EfiTestChildHandle (
> IN CONST EFI_GUID *ProtocolGuid
> );
> +/**
> + * This function checks the supported languages list for a target 
> language
> + *
> + * @param SupportedLanguages The supported languages
> + * @param TargetLanguage The target language
> + *
> + * @return Returns EFI_SUCCESS if the language is supported,
> + * EFI_UNSUPPORTED otherwise
> + */
> +EFI_STATUS
> +EFIAPI
> +IsLanguageSupported (
> + IN CONST CHAR8 *SupportedLanguages,
> + IN CONST CHAR8 *TargetLanguage
> + );
> +
> /**
> This function looks up a Unicode string in UnicodeStringTable.
> diff --git a/MdePkg/Library/UefiLib/UefiLib.c 
> b/MdePkg/Library/UefiLib/UefiLib.c
> index daa4af762e62..56281d25fd99 100644
> --- a/MdePkg/Library/UefiLib/UefiLib.c
> +++ b/MdePkg/Library/UefiLib/UefiLib.c
> @@ -640,6 +640,35 @@ EfiTestChildHandle (
> return Status;
> }
> +/**
> + * This function checks the supported languages list for a target 
> language
> + *
> + * @param SupportedLanguages The supported languages
> + * @param TargetLanguage The target language
> + *
> + * @return Returns EFI_SUCCESS if the language is supported,
> + * EFI_UNSUPPORTED otherwise
> + */
> +EFI_STATUS
> +EFIAPI
> +IsLanguageSupported (
> + IN CONST CHAR8 *SupportedLanguages,
> + IN CONST CHAR8 *TargetLanguage
> + )
> +{
> + UINTN Index;
> + while (*SupportedLanguages != 0) {
> + for (Index = 0; SupportedLanguages[Index] != 0 && 
> SupportedLanguages[Index] != ';'; Index++);
> + if ((AsciiStrnCmp(SupportedLanguages, TargetLanguage, Index) == 0) 
> && (TargetLanguage[Index] == 0)) {
> + return EFI_SUCCESS;
> + }
> + SupportedLanguages += Index;
> + for (; *SupportedLanguages != 0 && *SupportedLanguages == ';'; 
> SupportedLanguages++);
> + }
> +
> + return EFI_UNSUPPORTED;
> +}
> +
> /**
> This function looks up a Unicode string in UnicodeStringTable.
> @@ -800,24 +829,19 @@ LookupUnicodeString2 (
> // Make sure Language is in the set of Supported Languages
> //
> Found = FALSE;
> - while (*SupportedLanguages != 0) {
> - if (Iso639Language) {
> + if (Iso639Language) {
> + while (*SupportedLanguages != 0) {
> if (CompareIso639LanguageCode (Language, SupportedLanguages)) {
> Found = TRUE;
> break;
> }
> SupportedLanguages += 3;
> - } else {
> - for (Index = 0; SupportedLanguages[Index] != 0 && 
> SupportedLanguages[Index] != ';'; Index++);
> - if ((AsciiStrnCmp(SupportedLanguages, Language, Index) == 0) && 
> (Language[Index] == 0)) {
> - Found = TRUE;
> - break;
> - }
> - SupportedLanguages += Index;
> - for (; *SupportedLanguages != 0 && *SupportedLanguages == ';'; 
> SupportedLanguages++);
> }
> + } else {
> + Found = !IsLanguageSupported(Language, SupportedLanguages);
> }
> +
> //
> // If Language is not a member of SupportedLanguages, then return 
> EFI_UNSUPPORTED
> //
> @@ -1099,24 +1123,17 @@ AddUnicodeString2 (
> // Make sure Language is a member of SupportedLanguages
> //
> Found = FALSE;
> - while (*SupportedLanguages != 0) {
> - if (Iso639Language) {
> + if (Iso639Language) {
> + while (*SupportedLanguages != 0) {
> if (CompareIso639LanguageCode (Language, SupportedLanguages)) {
> Found = TRUE;
> break;
> }
> SupportedLanguages += 3;
> - } else {
> - for (Index = 0; SupportedLanguages[Index] != 0 && 
> SupportedLanguages[Index] != ';'; Index++);
> - if (AsciiStrnCmp(SupportedLanguages, Language, Index) == 0) {
> - Found = TRUE;
> - break;
> - }
> - SupportedLanguages += Index;
> - for (; *SupportedLanguages != 0 && *SupportedLanguages == ';'; 
> SupportedLanguages++);
> }
> + } else {
> + Found = !IsLanguageSupported(Language, SupportedLanguages);
> }
> -
> //
> // If Language is not a member of SupportedLanguages, then return 
> EFI_UNSUPPORTED
> //
>
> -- 
> 2.21.0
> 

[-- Attachment #2: Type: text/html, Size: 17088 bytes --]