ShellPkg/UefiShellDriver1CommandsLib: Remove unnecessary EFIAPI

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index ec3190da095b3d22b0cf27bd7766d9020ba6f1c6..ffdef043529f4b08d7353cc4bd21ff2aeac45eb7 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
@@ -1,8 +1,8 @@
 /** @file\r
   Main file for Drivers shell Driver1 function.\r
 \r
-  Copyright (c) 2012-2014, Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2015, 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
@@ -33,7 +33,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
                   free this memory.\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 GetDevicePathTextForHandle(\r
   IN EFI_HANDLE TheHandle\r
   )\r
@@ -98,7 +97,6 @@ GetDevicePathTextForHandle(
   @retval FALSE             The driver does not have Driver Configuration.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 ReturnDriverConfig(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r
@@ -120,7 +118,6 @@ ReturnDriverConfig(
   @retval FALSE             The driver does not have Driver Diagnostics.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 ReturnDriverDiag(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r
@@ -145,7 +142,6 @@ ReturnDriverDiag(
   @retval 0xFFFFFFFF  An error ocurred.\r
 **/\r
 UINT32\r
-EFIAPI\r
 ReturnDriverVersion(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r
@@ -217,7 +213,7 @@ ShellCommandRunDrivers (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drivers", ProblemParam);  \r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -225,7 +221,7 @@ ShellCommandRunDrivers (
     }\r
   } else {\r
     if (ShellCommandLineGetCount(Package) > 1) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drivers");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       if (ShellCommandLineGetFlag(Package, L"-l")){\r
@@ -235,7 +231,7 @@ ShellCommandRunDrivers (
           AsciiSPrint(Language, StrSize(Lang), "%S", Lang);\r
         } else {\r
           ASSERT(Language == NULL);\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drivers", L"-l");  \r
           ShellCommandLineFreeVarList (Package);\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
@@ -282,7 +278,7 @@ ShellCommandRunDrivers (
         TruncatedDriverName = NULL;\r
         if (!SfoFlag && (FullDriverName != NULL)) {\r
           TruncatedDriverName = AllocateZeroPool ((MAX_LEN_DRIVER_NAME + 1) * sizeof (CHAR16));\r
-          StrnCpy (TruncatedDriverName, FullDriverName, MAX_LEN_DRIVER_NAME);\r
+          StrnCpyS (TruncatedDriverName, MAX_LEN_DRIVER_NAME + 1, FullDriverName, MAX_LEN_DRIVER_NAME);\r
         }\r
 \r
         ShellPrintEx(\r