Refine the select language logic.

[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / DrvDiag.c

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
index 986dc3a05625054490cd8c0a65d6fe620f0dda8e..c3c1b575e8a0269c8f9cfbf63cda21e5f773cc9f 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for DrvDiag shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -71,7 +71,6 @@ DoDiagnostics (
   UINTN                               HandleIndex1;\r
   UINTN                               HandleIndex2;\r
   CHAR8                               *Language;\r
-  CHAR8                               *TempChar;\r
   BOOLEAN                             Found;\r
 \r
   if ((ChildHandle != NULL && AllChilds) || (Mode >= TestModeMax)){\r
@@ -180,24 +179,8 @@ DoDiagnostics (
                 gImageHandle,\r
                 NULL,\r
                 EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
-              if (!EFI_ERROR(Status)) {\r
-                if (Lang == NULL) {\r
-                  Language = AllocateZeroPool(AsciiStrSize(DriverDiagnostics2->SupportedLanguages));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, DriverDiagnostics2->SupportedLanguages);\r
-                  TempChar = AsciiStrStr(Language, ";");\r
-                  if (TempChar != NULL){\r
-                    *TempChar = CHAR_NULL;\r
-                  }\r
-                } else {\r
-                  Language = AllocateZeroPool(AsciiStrSize(Lang));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, Lang);\r
-                }\r
+              if (!EFI_ERROR(Status) && (DriverDiagnostics2 != NULL)) {\r
+                Language = GetBestLanguageForDriver(DriverDiagnostics2->SupportedLanguages, Lang, FALSE);\r
                 Found = TRUE;\r
                 Status = DriverDiagnostics2->RunDiagnostics(\r
                   DriverDiagnostics2,\r
@@ -220,23 +203,7 @@ DoDiagnostics (
                 NULL,\r
                 EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
               if (!EFI_ERROR(Status)) {\r
-                if (Lang == NULL) {\r
-                  Language = AllocateZeroPool(AsciiStrSize(DriverDiagnostics2->SupportedLanguages));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, DriverDiagnostics2->SupportedLanguages);\r
-                  TempChar = AsciiStrStr(Language, ";");\r
-                  if (TempChar != NULL){\r
-                    *TempChar = CHAR_NULL;\r
-                  }\r
-                } else {\r
-                  Language = AllocateZeroPool(AsciiStrSize(Lang));\r
-                  if (Language == NULL) {\r
-                    return (EFI_OUT_OF_RESOURCES);\r
-                  }\r
-                  AsciiStrCpy(Language, Lang);\r
-                }\r
+                Language = GetBestLanguageForDriver(DriverDiagnostics->SupportedLanguages, Lang, FALSE);\r
                 Status = DriverDiagnostics->RunDiagnostics(\r
                   DriverDiagnostics,\r
                   ControllerHandleList[ControllerHandleListLoop],\r