FatPkg/EnhancedFatDxe: rebase to ARRAY_SIZE()

[mirror_edk2.git] / FatPkg / EnhancedFatDxe / UnicodeCollation.c

diff --git a/FatPkg/EnhancedFatDxe/UnicodeCollation.c b/FatPkg/EnhancedFatDxe/UnicodeCollation.c
index f483a5af94a8ca05fba7355aac1a967377766fcf..61b9aab4d93a66296001cd0b2bd175490c826f60 100644 (file)
--- a/FatPkg/EnhancedFatDxe/UnicodeCollation.c
+++ b/FatPkg/EnhancedFatDxe/UnicodeCollation.c
@@ -2,7 +2,7 @@
   Unicode Collation Support component that hides the trivial difference of Unicode Collation\r
   and Unicode collation 2 Protocol.\r
 \r
-  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials are licensed and made available\r
 under the terms and conditions of the BSD License which accompanies this\r
 distribution. The full text of the license may be found at\r
@@ -40,6 +40,7 @@ InitializeUnicodeCollationSupportWorker (
   IN CONST CHAR8        *DefaultLanguage\r
   )\r
 {\r
+  EFI_STATUS                      ReturnStatus;\r
   EFI_STATUS                      Status;\r
   UINTN                           NumHandles;\r
   UINTN                           Index;\r
@@ -61,9 +62,9 @@ InitializeUnicodeCollationSupportWorker (
   }\r
 \r
   Iso639Language = (BOOLEAN) (ProtocolGuid == &gEfiUnicodeCollationProtocolGuid);\r
-  Language = GetEfiGlobalVariable(VariableName);\r
+  GetEfiGlobalVariable2 (VariableName, (VOID**) &Language, NULL);\r
 \r
-  Status = EFI_UNSUPPORTED;\r
+  ReturnStatus = EFI_UNSUPPORTED;\r
   for (Index = 0; Index < NumHandles; Index++) {\r
     //\r
     // Open Unicode Collation Protocol\r
@@ -94,7 +95,7 @@ InitializeUnicodeCollationSupportWorker (
     if (BestLanguage != NULL) {\r
       FreePool (BestLanguage);\r
       mUnicodeCollationInterface = Uci;\r
-      Status = EFI_SUCCESS;\r
+      ReturnStatus = EFI_SUCCESS;\r
       break;\r
     }\r
   }\r
@@ -105,7 +106,7 @@ InitializeUnicodeCollationSupportWorker (
 \r
   FreePool (Handles);\r
 \r
-  return Status;\r
+  return ReturnStatus;\r
 }\r
 \r
 /**\r