From 2cd1716d61522d2750b3d2748e0319644d0eac08 Mon Sep 17 00:00:00 2001 From: Qing Huang Date: Wed, 25 Mar 2009 08:40:00 +0000 Subject: [PATCH] Refactor to invoke only one GetBestLanguage() (based on FatPkg commit 25e83a4e8906ef80e428b7c446216faa1ba9e2a7) [jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD] Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Acked-by: Mark Doran Acked-by: Laszlo Ersek --- FatPkg/EnhancedFatDxe/UnicodeCollation.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/FatPkg/EnhancedFatDxe/UnicodeCollation.c b/FatPkg/EnhancedFatDxe/UnicodeCollation.c index 574db9783e..e0b7e0d6f0 100644 --- a/FatPkg/EnhancedFatDxe/UnicodeCollation.c +++ b/FatPkg/EnhancedFatDxe/UnicodeCollation.c @@ -87,23 +87,13 @@ InitializeUnicodeCollationSupportWorker ( // Find the best matching matching language from the supported languages // of Unicode Collation (2) protocol. // - if (Language == NULL) { - BestLanguage = GetBestLanguage ( - Uci->SupportedLanguages, - Iso639Language, - DefaultLanguage, - NULL - ); - } else { - BestLanguage = GetBestLanguage ( - Uci->SupportedLanguages, - Iso639Language, - Language, - Iso639Language, - DefaultLanguage, - NULL - ); - } + BestLanguage = GetBestLanguage ( + Uci->SupportedLanguages, + Iso639Language, + (Language == NULL) ? Language : "", + DefaultLanguage, + NULL + ); if (BestLanguage != NULL) { FreePool (BestLanguage); mUnicodeCollationInterface = Uci; -- 2.39.2