ShellPkg/Application: Remove unnecessary EFIAPI

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Ruiyu Ni <Ruiyu.ni@intel.com>

diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c b/ShellPkg/Application/Shell/ConsoleLogger.c
index 563e5e6be76a8062f3ff44f904d6b96d7e000860..bc96da1f1bcea672c4dd5f57ce85cac878908eb0 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleLogger.c
+++ b/ShellPkg/Application/Shell/ConsoleLogger.c
@@ -29,7 +29,6 @@
   @sa InstallProtocolInterface\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerInstall(\r
   IN CONST UINTN ScreensToSave,\r
   OUT CONSOLE_LOGGER_PRIVATE_DATA **ConsoleInfo\r
@@ -114,7 +113,6 @@ ConsoleLoggerInstall(
   @return other           The operation failed.  This was from UninstallProtocolInterface.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerUninstall(\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   )\r
@@ -162,7 +160,6 @@ ConsoleLoggerUninstall(
   @param[in] ConsoleInfo  The pointer to the instance of the console logger information.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerDisplayHistory(\r
   IN CONST BOOLEAN  Forward,\r
   IN CONST UINTN    Rows,\r
@@ -238,7 +235,6 @@ ConsoleLoggerDisplayHistory(
   @sa UpdateDisplayFromHistory\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerStopHistory(\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   )\r
@@ -265,7 +261,6 @@ ConsoleLoggerStopHistory(
   @return other           The operation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 UpdateDisplayFromHistory(\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   )\r
@@ -454,7 +449,6 @@ ConsoleLoggerReset (
   @param[in] ConsoleInfo  The pointer to the instance of the console logger information.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 AppendStringToHistory(\r
   IN CONST CHAR16 *String,\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
@@ -609,7 +603,6 @@ AppendStringToHistory(
                                   rendered and were skipped.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerOutputStringSplit(\r
   IN CONST CHAR16   *String,\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
@@ -638,7 +631,6 @@ ConsoleLoggerOutputStringSplit(
   @return other         Break was choosen\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerDoPageBreak(\r
   VOID\r
   )\r
@@ -697,7 +689,6 @@ ConsoleLoggerDoPageBreak(
                                   rendered and were skipped.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerPrintWithPageBreak(\r
   IN CONST CHAR16   *String,\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
@@ -1208,7 +1199,6 @@ ConsoleLoggerEnableCursor (
   history buffers.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerResetBuffers(\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   )\r

diff --git a/ShellPkg/Application/Shell/ConsoleLogger.h b/ShellPkg/Application/Shell/ConsoleLogger.h
index 19034c90500b31a580b3f14bbf4226228437f40a..881c24b790bebf167160cce24398c123d837eb5d 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleLogger.h
+++ b/ShellPkg/Application/Shell/ConsoleLogger.h
@@ -58,7 +58,6 @@ typedef struct _CONSOLE_LOGGER_PRIVATE_DATA{
   @sa InstallProtocolInterface\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerInstall(\r
   IN CONST UINTN ScreensToSave,\r
   OUT CONSOLE_LOGGER_PRIVATE_DATA **ConsoleInfo\r
@@ -74,7 +73,6 @@ ConsoleLoggerInstall(
   @return other           The operation failed.  This was from UninstallProtocolInterface.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerUninstall(\r
   IN OUT CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   );\r
@@ -92,7 +90,6 @@ ConsoleLoggerUninstall(
   @param[in] ConsoleInfo  The pointer to the instance of the console logger information.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerDisplayHistory(\r
   IN CONST BOOLEAN  Forward,\r
   IN CONST UINTN    Rows,\r
@@ -109,7 +106,6 @@ ConsoleLoggerDisplayHistory(
   @sa UpdateDisplayFromHistory\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerStopHistory(\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   );\r
@@ -122,7 +118,6 @@ ConsoleLoggerStopHistory(
   @return other           The operation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 UpdateDisplayFromHistory(\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   );\r
@@ -320,7 +315,6 @@ ConsoleLoggerEnableCursor (
   history buffers.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConsoleLoggerResetBuffers(\r
   IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo\r
   );\r

diff --git a/ShellPkg/Application/Shell/ConsoleWrappers.c b/ShellPkg/Application/Shell/ConsoleWrappers.c
index 46af141eba99c9de3827f44a1f0689ee7327b417..e1846ec9cba6e151f3a355eb6dc896a9579d571a 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleWrappers.c
+++ b/ShellPkg/Application/Shell/ConsoleWrappers.c
@@ -133,7 +133,6 @@ FileBasedSimpleTextInReadKeyStroke(
   @return                     A pointer to the allocated protocol structure;\r
 **/\r
 EFI_SIMPLE_TEXT_INPUT_PROTOCOL*\r
-EFIAPI\r
 CreateSimpleTextInOnFile(\r
   IN SHELL_FILE_HANDLE  FileHandleToUse,\r
   IN EFI_HANDLE         *HandleLocation\r
@@ -200,7 +199,6 @@ CreateSimpleTextInOnFile(
   @retval EFI_SUCCESS         The object was closed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CloseSimpleTextInOnFile(\r
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *SimpleTextIn\r
   )\r
@@ -434,7 +432,6 @@ FileBasedSimpleTextOutOutputString (
   @return                     A pointer to the allocated protocol structure;\r
 **/\r
 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*\r
-EFIAPI\r
 CreateSimpleTextOutOnFile(\r
   IN SHELL_FILE_HANDLE               FileHandleToUse,\r
   IN EFI_HANDLE                      *HandleLocation,\r
@@ -499,7 +496,6 @@ CreateSimpleTextOutOnFile(
   @retval EFI_SUCCESS         The object was closed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CloseSimpleTextOutOnFile(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *SimpleTextOut\r
   )\r

diff --git a/ShellPkg/Application/Shell/ConsoleWrappers.h b/ShellPkg/Application/Shell/ConsoleWrappers.h
index ecd99a863dccbf448c642f9cd836ba8332db88dc..35f3a717f5c0a2df6fffb05b100dea198b916590 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleWrappers.h
+++ b/ShellPkg/Application/Shell/ConsoleWrappers.h
@@ -27,7 +27,6 @@
   @return                     A pointer to the allocated protocol structure;\r
 **/\r
 EFI_SIMPLE_TEXT_INPUT_PROTOCOL*\r
-EFIAPI\r
 CreateSimpleTextInOnFile(\r
   IN SHELL_FILE_HANDLE  FileHandleToUse,\r
   IN EFI_HANDLE         *HandleLocation\r
@@ -42,7 +41,6 @@ CreateSimpleTextInOnFile(
   @retval EFI_SUCCESS         The object was closed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CloseSimpleTextInOnFile(\r
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *SimpleTextIn\r
   );\r
@@ -59,7 +57,6 @@ CloseSimpleTextInOnFile(
   @return                     A pointer to the allocated protocol structure;\r
 **/\r
 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*\r
-EFIAPI\r
 CreateSimpleTextOutOnFile(\r
   IN SHELL_FILE_HANDLE               FileHandleToUse,\r
   IN EFI_HANDLE                      *HandleLocation,\r
@@ -75,7 +72,6 @@ CreateSimpleTextOutOnFile(
   @retval EFI_SUCCESS         The object was closed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CloseSimpleTextOutOnFile(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *SimpleTextOut\r
   );\r

diff --git a/ShellPkg/Application/Shell/FileHandleInternal.h b/ShellPkg/Application/Shell/FileHandleInternal.h
index 11b490267c82b4328fa4f56f1d8282fe6fe4c945..1e519808565a8b707b026bb19c3c73d86b738e0e 100644 (file)
--- a/ShellPkg/Application/Shell/FileHandleInternal.h
+++ b/ShellPkg/Application/Shell/FileHandleInternal.h
@@ -23,7 +23,6 @@
   @param[in, out] Row         Current row of the cursor position\r
 **/\r
 VOID\r
-EFIAPI\r
 MoveCursorBackward (\r
   IN     UINTN                   LineLength,\r
   IN OUT UINTN                   *Column,\r
@@ -39,7 +38,6 @@ MoveCursorBackward (
   @param[in, out] Row         Current row of the cursor position\r
 **/\r
 VOID\r
-EFIAPI\r
 MoveCursorForward (\r
   IN     UINTN                   LineLength,\r
   IN     UINTN                   TotalRow,\r
@@ -57,7 +55,6 @@ MoveCursorForward (
   @param[in] StartColumn  which column to start at\r
 **/\r
 VOID\r
-EFIAPI\r
 PrintCommandHistory (\r
   IN CONST UINTN TotalCols,\r
   IN CONST UINTN TotalRows,\r

diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c b/ShellPkg/Application/Shell/FileHandleWrappers.c
index 0d38e9d5fe61ce72c9d59577b5ece7ba0292f77a..9a75a686a4ff71d5641ed30bbaf7e7e7e63c4302 100644 (file)
--- a/ShellPkg/Application/Shell/FileHandleWrappers.c
+++ b/ShellPkg/Application/Shell/FileHandleWrappers.c
@@ -302,7 +302,6 @@ FileInterfaceNulWrite(
   @param[out] TabUpdatePos      Return the TAB update position.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CreateTabCompletionList (\r
   IN CONST CHAR16             *InputString,\r
   IN CONST UINTN              StringLen, \r
@@ -1227,7 +1226,6 @@ FileInterfaceEnvNonVolWrite(
   @return other     a pointer to an EFI_FILE_PROTOCOL structure\r
 **/\r
 EFI_FILE_PROTOCOL*\r
-EFIAPI\r
 CreateFileInterfaceEnv(\r
   IN CONST CHAR16 *EnvName\r
   )\r
@@ -1290,7 +1288,6 @@ CreateFileInterfaceEnv(
   @param[in, out] Row         Current row of the cursor position\r
 **/\r
 VOID\r
-EFIAPI\r
 MoveCursorBackward (\r
   IN     UINTN                   LineLength,\r
   IN OUT UINTN                   *Column,\r
@@ -1320,7 +1317,6 @@ MoveCursorBackward (
   @param[in, out] Row         Current row of the cursor position\r
 **/\r
 VOID\r
-EFIAPI\r
 MoveCursorForward (\r
   IN     UINTN                   LineLength,\r
   IN     UINTN                   TotalRow,\r
@@ -1352,7 +1348,6 @@ MoveCursorForward (
   @param[in] StartColumn  which column to start at\r
 **/\r
 VOID\r
-EFIAPI\r
 PrintCommandHistory (\r
   IN CONST UINTN TotalCols,\r
   IN CONST UINTN TotalRows,\r
@@ -1576,7 +1571,6 @@ FileInterfaceMemClose(
   @return other     A pointer to an EFI_FILE_PROTOCOL structure.\r
 **/\r
 EFI_FILE_PROTOCOL*\r
-EFIAPI\r
 CreateFileInterfaceMem(\r
   IN CONST BOOLEAN Unicode\r
   )\r

diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.h b/ShellPkg/Application/Shell/FileHandleWrappers.h
index af133b09637e73b4f0596976cd0803a0b77ee630..9034d696e17d4773c192d5f69e02703c24b7ebc0 100644 (file)
--- a/ShellPkg/Application/Shell/FileHandleWrappers.h
+++ b/ShellPkg/Application/Shell/FileHandleWrappers.h
@@ -55,7 +55,6 @@ extern EFI_FILE_PROTOCOL FileInterfaceNulFile;
   @return other     a pointer to an EFI_FILE_PROTOCOL structure\r
 **/\r
 EFI_FILE_PROTOCOL*\r
-EFIAPI\r
 CreateFileInterfaceEnv(\r
   CONST CHAR16 *EnvName\r
   );\r
@@ -70,7 +69,6 @@ CreateFileInterfaceEnv(
   @return other     a pointer to an EFI_FILE_PROTOCOL structure\r
 **/\r
 EFI_FILE_PROTOCOL*\r
-EFIAPI\r
 CreateFileInterfaceMem(\r
   IN CONST BOOLEAN Unicode\r
   );\r

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 0b6362e92677882eda60ba6c74c86169e6b1760c..b39d81d0eeb8b710e56e71dbc414f1c494f690bf 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -80,7 +80,6 @@ CONST CHAR16 mNoNestingFalse[]              = L"False";
   @param[in] String pointer to the string to trim them off.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 TrimSpaces(\r
   IN CHAR16 **String\r
   )\r
@@ -113,7 +112,6 @@ TrimSpaces(
   @param[in] CheckForEscapeCharacter  TRUE to skip escaped instances of FinfString, otherwise will return even escaped instances\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 FindNextInstance(\r
   IN CONST CHAR16   *SourceString,\r
   IN CONST CHAR16   *FindString,\r
@@ -202,7 +200,6 @@ IsValidEnvironmentVariableName(
   @retval FALSE           CmdLine does not have a valid split.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 ContainsSplit(\r
   IN CONST CHAR16 *CmdLine\r
   )\r
@@ -252,7 +249,6 @@ ContainsSplit(
   @retval EFI_OUT_OF_RESOURCES  There is not enough memory available.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalEfiShellStartCtrlSMonitor(\r
   VOID\r
   )\r
@@ -729,7 +725,6 @@ FreeResources:
   @retval EFI_SUCCESS           all init commands were run successfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetBuiltInAlias(\r
   )\r
 {\r
@@ -768,7 +763,6 @@ SetBuiltInAlias(
   @retval FALSE             The 2 command names are not the same.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsCommand(\r
   IN CONST CHAR16 *Command1,\r
   IN CONST CHAR16 *Command2\r
@@ -789,7 +783,6 @@ IsCommand(
   @retval FALSE             The command is not a script only command.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsScriptOnlyCommand(\r
   IN CONST CHAR16 *CommandName\r
   )\r
@@ -820,7 +813,6 @@ IsScriptOnlyCommand(
   @sa HandleProtocol\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetDevicePathsForImageAndFile (\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL **DevPath,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL **FilePath\r
@@ -896,7 +888,6 @@ GetDevicePathsForImageAndFile (
   @retval EFI_SUCCESS           The variable is initialized.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessCommandLine(\r
   VOID\r
   )\r
@@ -1103,7 +1094,6 @@ ProcessCommandLine(
   @retval EFI_SUCCESS           the variable is initialized.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoStartupScript(\r
   IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,\r
   IN EFI_DEVICE_PATH_PROTOCOL *FilePath\r
@@ -1251,7 +1241,6 @@ DoStartupScript(
   @retval RETURN_ABORTED\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoShellPrompt (\r
   VOID\r
   )\r
@@ -1318,7 +1307,6 @@ DoShellPrompt (
   @param Buffer   Something to pass to FreePool when the shell is exiting.\r
 **/\r
 VOID*\r
-EFIAPI\r
 AddBufferToFreeList (\r
   VOID *Buffer\r
   )\r
@@ -1375,7 +1363,6 @@ RestoreBufferList (
   @param Buffer     The line buffer to add.\r
 **/\r
 VOID\r
-EFIAPI\r
 AddLineToCommandHistory(\r
   IN CONST CHAR16 *Buffer\r
   )\r
@@ -1437,7 +1424,6 @@ AddLineToCommandHistory(
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ShellConvertAlias(\r
   IN OUT CHAR16 **CommandString\r
   )\r
@@ -1462,7 +1448,6 @@ ShellConvertAlias(
   @param[in,out] CmdLine   The command line to update.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 StripUnreplacedEnvironmentVariables(\r
   IN OUT CHAR16 *CmdLine\r
   )\r
@@ -1535,7 +1520,6 @@ StripUnreplacedEnvironmentVariables(
   @return                           The new command line with no environment variables present.\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 ShellConvertVariables (\r
   IN CONST CHAR16 *OriginalCommandLine\r
   )\r
@@ -1671,7 +1655,6 @@ ShellConvertVariables (
   @retval other             Some error occurs when executing the split command.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunSplitCommand(\r
   IN CONST CHAR16             *CmdLine,\r
   IN       SHELL_FILE_HANDLE  *StdIn,\r
@@ -1790,7 +1773,6 @@ RunSplitCommand(
   @retval EFI_OUT_OF_RESOURCES  a memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ShellSubstituteVariables(\r
   IN CHAR16 **CmdLine\r
   )\r
@@ -1815,7 +1797,6 @@ ShellSubstituteVariables(
   @retval EFI_OUT_OF_RESOURCES  a memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ShellSubstituteAliases(\r
   IN CHAR16 **CmdLine\r
   )\r
@@ -1887,7 +1868,6 @@ ShellSubstituteAliases(
   @retval Efi_Application     the name is an application (.EFI).\r
 **/\r
 SHELL_OPERATION_TYPES\r
-EFIAPI\r
 GetOperationType(\r
   IN CONST CHAR16 *CmdName\r
   )\r
@@ -1956,7 +1936,6 @@ GetOperationType(
   @retval EFI_NOT_FOUND         The operation type is unknown or invalid.\r
 **/\r
 EFI_STATUS \r
-EFIAPI\r
 IsValidSplit(\r
   IN CONST CHAR16 *CmdLine\r
   )\r
@@ -2015,7 +1994,6 @@ IsValidSplit(
   @retval EFI_ABORTED     CmdLine has at least one invalid command or application.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 VerifySplit(\r
   IN CONST CHAR16 *CmdLine\r
   )\r
@@ -2061,7 +2039,6 @@ VerifySplit(
   @return               an error occurred.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessNewSplitCommandLine(\r
   IN CONST CHAR16 *CmdLine\r
   )\r
@@ -2102,7 +2079,6 @@ ProcessNewSplitCommandLine(
   @retval EFI_SUCCESS The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ChangeMappedDrive(\r
   IN CONST CHAR16 *CmdLine\r
   )\r
@@ -2138,7 +2114,6 @@ ChangeMappedDrive(
   @param[in,out] CmdLine        pointer to the command line to update\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoHelpUpdate(\r
   IN OUT CHAR16 **CmdLine\r
   )\r
@@ -2192,7 +2167,6 @@ DoHelpUpdate(
   @param[in] ErrorCode      the error code to put into lasterror.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetLastError(\r
   IN CONST SHELL_STATUS   ErrorCode\r
   )\r
@@ -2219,7 +2193,6 @@ SetLastError(
   @return                       some other error occurred\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessCommandLineToFinal(\r
   IN OUT CHAR16 **CmdLine\r
   )\r
@@ -2272,7 +2245,6 @@ ProcessCommandLineToFinal(
   @retval EFI_ABORTED     The command's operation was aborted.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunInternalCommand(\r
   IN CONST CHAR16                   *CmdLine,\r
   IN       CHAR16                   *FirstParameter,\r
@@ -2385,7 +2357,6 @@ RunInternalCommand(
   @retval EFI_ABORTED     The command's operation was aborted.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunCommandOrFile(\r
   IN       SHELL_OPERATION_TYPES    Type,\r
   IN CONST CHAR16                   *CmdLine,\r
@@ -2515,7 +2486,6 @@ RunCommandOrFile(
   @retval EFI_ABORTED     The command's operation was aborted.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetupAndRunCommandOrFile(\r
   IN   SHELL_OPERATION_TYPES          Type,\r
   IN   CHAR16                         *CmdLine,\r
@@ -2578,7 +2548,6 @@ SetupAndRunCommandOrFile(
   @retval EFI_ABORTED     The command's operation was aborted.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunShellCommand(\r
   IN CONST CHAR16   *CmdLine,\r
   OUT EFI_STATUS    *CommandStatus\r
@@ -2699,7 +2668,6 @@ RunShellCommand(
   @retval EFI_ABORTED     The command's operation was aborted.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunCommand(\r
   IN CONST CHAR16   *CmdLine\r
   )\r
@@ -2719,7 +2687,6 @@ STATIC CONST UINT16 InvalidChars[] = {L'*', L'?', L'<', L'>', L'\\', L'/', L'\"'
   @retval FALSE             CommandName could not be a valid command name\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidCommandName(\r
   IN CONST CHAR16     *CommandName\r
   )\r
@@ -2749,7 +2716,6 @@ IsValidCommandName(
   @retval EFI_SUCCESS           the script completed successfully\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunScriptFileHandle (\r
   IN SHELL_FILE_HANDLE  Handle,\r
   IN CONST CHAR16       *Name\r
@@ -3067,7 +3033,6 @@ RunScriptFileHandle (
   @retval EFI_SUCCESS           the script completed successfully\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunScriptFile (\r
   IN CONST CHAR16                   *ScriptPath,\r
   IN SHELL_FILE_HANDLE              Handle OPTIONAL,\r
@@ -3131,7 +3096,6 @@ RunScriptFile (
   @retval CHAR_NULL no instance of any character in CharacterList was found in String\r
 **/\r
 CONST CHAR16*\r
-EFIAPI\r
 FindFirstCharacter(\r
   IN CONST CHAR16 *String,\r
   IN CONST CHAR16 *CharacterList,\r

diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h
index 29b36b003a52ff1281c80ee1e8b25c574f689143..a93ea60ad17ec986fb60a11bb1a7de29273ff9ef 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.h
+++ b/ShellPkg/Application/Shell/Shell.h
@@ -151,7 +151,6 @@ extern SHELL_INFO ShellInfoObject;
   @return                       some other error occurred\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessCommandLineToFinal(\r
   IN OUT CHAR16 **CmdLine\r
   );\r
@@ -162,7 +161,6 @@ ProcessCommandLineToFinal(
   @param[in] ErrorCode      the error code to put into lasterror\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetLastError(\r
   IN CONST SHELL_STATUS   ErrorCode\r
   );\r
@@ -173,7 +171,6 @@ SetLastError(
   @retval EFI_SUCCESS           all init commands were run successfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetBuiltInAlias(\r
   VOID\r
   );\r
@@ -193,7 +190,6 @@ SetBuiltInAlias(
   @sa HandleProtocol\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetDevicePathsForImageAndFile (\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL **DevPath,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL **FilePath\r
@@ -227,7 +223,6 @@ GetDevicePathsForImageAndFile (
   @retval EFI_SUCCESS           the variable is initialized.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessCommandLine(\r
   VOID\r
   );\r
@@ -243,7 +238,6 @@ ProcessCommandLine(
   @retval EFI_SUCCESS           The variable is initialized.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoStartupScript(\r
   IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,\r
   IN EFI_DEVICE_PATH_PROTOCOL *FilePath\r
@@ -258,7 +252,6 @@ DoStartupScript(
   @retval RETURN_ABORTED\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoShellPrompt (\r
   VOID\r
   );\r
@@ -270,7 +263,6 @@ DoShellPrompt (
   @param Buffer   Something to pass to FreePool when the shell is exiting.\r
 **/\r
 VOID*\r
-EFIAPI\r
 AddBufferToFreeList(\r
   VOID *Buffer\r
   );\r
@@ -281,7 +273,6 @@ AddBufferToFreeList(
   @param Buffer[in]     The line buffer to add.\r
 **/\r
 VOID\r
-EFIAPI\r
 AddLineToCommandHistory(\r
   IN CONST CHAR16 *Buffer\r
   );\r
@@ -297,7 +288,6 @@ AddLineToCommandHistory(
   @retval EFI_ABORTED     the command's operation was aborted\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunCommand(\r
   IN CONST CHAR16   *CmdLine\r
   );\r
@@ -315,7 +305,6 @@ RunCommand(
   @retval EFI_ABORTED     The command's operation was aborted.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunShellCommand(\r
   IN CONST CHAR16   *CmdLine,\r
   OUT EFI_STATUS    *CommandStatus\r
@@ -331,7 +320,6 @@ RunShellCommand(
   @retval FALSE             CommandName could not be a valid command name\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidCommandName(\r
   IN CONST CHAR16     *CommandName\r
   );\r
@@ -345,7 +333,6 @@ IsValidCommandName(
   @retval EFI_SUCCESS           the script completed successfully\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunScriptFileHandle (\r
   IN SHELL_FILE_HANDLE  Handle,\r
   IN CONST CHAR16       *Name\r
@@ -362,7 +349,6 @@ RunScriptFileHandle (
   @retval EFI_SUCCESS           the script completed successfully\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunScriptFile (\r
   IN CONST CHAR16                   *ScriptPath,\r
   IN SHELL_FILE_HANDLE              Handle OPTIONAL,\r
@@ -381,7 +367,6 @@ RunScriptFile (
   @retval CHAR_NULL no instance of any character in CharacterList was found in String\r
 **/\r
 CONST CHAR16*\r
-EFIAPI\r
 FindFirstCharacter(\r
   IN CONST CHAR16 *String,\r
   IN CONST CHAR16 *CharacterList,\r
@@ -394,7 +379,6 @@ FindFirstCharacter(
   @param[in] String pointer to the string to trim them off.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 TrimSpaces(\r
   IN CHAR16 **String\r
   );\r

diff --git a/ShellPkg/Application/Shell/ShellEnvVar.c b/ShellPkg/Application/Shell/ShellEnvVar.c
index 77bf599eab1c8f7e0b59a5b0f0551b2ba88a2ee2..6d8c79b4ca6a21c42a8c597d215d58493e7fa6fa 100644 (file)
--- a/ShellPkg/Application/Shell/ShellEnvVar.c
+++ b/ShellPkg/Application/Shell/ShellEnvVar.c
@@ -91,7 +91,6 @@ IsVolatileEnv (
   @param[in] List               The pointer to pointer to list.\r
 **/\r
 VOID\r
-EFIAPI\r
 FreeEnvironmentVariableList(\r
   IN LIST_ENTRY *List\r
   )\r
@@ -128,7 +127,6 @@ FreeEnvironmentVariableList(
   @retval EFI_SUCCESS           the list was created sucessfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetEnvironmentVariableList(\r
   IN OUT LIST_ENTRY *ListHead\r
   )\r
@@ -238,7 +236,6 @@ GetEnvironmentVariableList(
   @retval EFI_SUCCESS           the list was Set sucessfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetEnvironmentVariableList(\r
   IN LIST_ENTRY *ListHead\r
   )\r
@@ -302,7 +299,6 @@ SetEnvironmentVariableList(
   @sa SetEnvironmentVariableList\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetEnvironmentVariables(\r
   IN CONST CHAR16 **Environment\r
   )\r

diff --git a/ShellPkg/Application/Shell/ShellEnvVar.h b/ShellPkg/Application/Shell/ShellEnvVar.h
index f05ef2bd66fff51974c648f2145ca4d48c872185..b9efed042b7153a588237fca18858195de0684f8 100644 (file)
--- a/ShellPkg/Application/Shell/ShellEnvVar.h
+++ b/ShellPkg/Application/Shell/ShellEnvVar.h
@@ -156,7 +156,6 @@ IsVolatileEnv (
   @retval EFI_SUCCESS           the list was created sucessfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetEnvironmentVariableList(\r
   IN OUT LIST_ENTRY *List\r
   );\r
@@ -174,7 +173,6 @@ GetEnvironmentVariableList(
   @retval EFI_SUCCESS           The list was Set sucessfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetEnvironmentVariableList(\r
   IN LIST_ENTRY *List\r
   );\r
@@ -195,7 +193,6 @@ SetEnvironmentVariableList(
   @sa SetEnvironmentVariableList\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetEnvironmentVariables(\r
   IN CONST CHAR16 **Environment\r
   );\r
@@ -206,7 +203,6 @@ SetEnvironmentVariables(
   @param[in] List               The pointer to pointer to list.\r
 **/\r
 VOID\r
-EFIAPI\r
 FreeEnvironmentVariableList(\r
   IN LIST_ENTRY *List\r
   );\r

diff --git a/ShellPkg/Application/Shell/ShellManParser.c b/ShellPkg/Application/Shell/ShellManParser.c
index 948759fe46c89d7ad331bd5480ffc7e83eba63db..7a290e16f670828a58fc61fe902d1e948d09d0f8 100644 (file)
--- a/ShellPkg/Application/Shell/ShellManParser.c
+++ b/ShellPkg/Application/Shell/ShellManParser.c
@@ -63,7 +63,6 @@ SHELL_MAN_HII_VENDOR_DEVICE_PATH  mShellManHiiDevicePath = {
 \r
 **/\r
 CHAR16\r
-EFIAPI \r
 InternalShellCharToUpper (\r
   IN CHAR16  Char\r
   );\r
@@ -79,7 +78,6 @@ InternalShellCharToUpper (
   @return                          the new filename with .efi as the extension.\r
 **/\r
 CHAR16 *\r
-EFIAPI\r
 GetExecuatableFileName (\r
   IN CONST CHAR16    *NameString\r
   )\r
@@ -132,7 +130,6 @@ GetExecuatableFileName (
   @return the new filename with .man as the extension.\r
 **/\r
 CHAR16 *\r
-EFIAPI\r
 GetManFileName(\r
   IN CONST CHAR16 *ManFileName\r
   )\r
@@ -179,7 +176,6 @@ GetManFileName(
   @retval EFI_NOT_FOUND         The file was not found.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SearchPathForFile(\r
   IN CONST CHAR16             *FileName,\r
   OUT SHELL_FILE_HANDLE       *Handle\r
@@ -227,7 +223,6 @@ SearchPathForFile(
                                 an alloceted buffer.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ManBufferFindSections(\r
   IN CONST CHAR16 *Buffer,\r
   IN CONST CHAR16 *Sections,\r
@@ -361,7 +356,6 @@ ManBufferFindSections(
                                 an alloceted buffer.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ManFileFindSections(\r
   IN SHELL_FILE_HANDLE  Handle,\r
   IN CONST CHAR16       *Sections,\r
@@ -475,7 +469,6 @@ ManFileFindSections(
                                 an alloceted buffer.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ManBufferFindTitleSection(\r
   IN CHAR16         **Buffer,\r
   IN CONST CHAR16   *Command,\r
@@ -712,7 +705,6 @@ IsTitleHeader(
                                 an allocated buffer if requested.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ManFileFindTitleSection(\r
   IN SHELL_FILE_HANDLE  Handle,\r
   IN CONST CHAR16       *Command,\r
@@ -805,7 +797,6 @@ ManFileFindTitleSection(
   @retval EFI_NOT_FOUND         There is no help text available for Command.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessManFile(\r
   IN CONST CHAR16 *ManFileName,\r
   IN CONST CHAR16 *Command,\r

diff --git a/ShellPkg/Application/Shell/ShellManParser.h b/ShellPkg/Application/Shell/ShellManParser.h
index 3807eec9b2ed38b9d8c087b23590df874bcdd07b..bb530a3fcf7245fa3a63f61681a9c381d9be4a90 100644 (file)
--- a/ShellPkg/Application/Shell/ShellManParser.h
+++ b/ShellPkg/Application/Shell/ShellManParser.h
@@ -45,7 +45,6 @@
   @retval EFI_NOT_FOUND         There is no help text available for Command.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessManFile(\r
   IN CONST CHAR16 *ManFileName,\r
   IN CONST CHAR16 *Command,\r
@@ -73,7 +72,6 @@ ProcessManFile(
                                 an alloceted buffer.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ManFileFindSections(\r
   IN SHELL_FILE_HANDLE  Handle,\r
   IN CONST CHAR16       *Sections,\r

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 58156a21bddb8bc30221cd8153b161722c0025ef..499915521aeec1f27d4dc66266453afd152424ff 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -26,7 +26,6 @@ BOOLEAN AsciiRedirection = FALSE;
   @param[in] String        the string to parse\r
 **/\r
 CONST CHAR16*\r
-EFIAPI\r
 FindEndOfParameter(\r
   IN CONST CHAR16 *String\r
   )\r
@@ -86,7 +85,6 @@ FindEndOfParameter(
   @return   EFI_NOT_FOUND         A closing " could not be found on the specified string\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetNextParameter(\r
   IN OUT CHAR16   **Walker,\r
   IN OUT CHAR16   **TempParameter,\r
@@ -196,7 +194,6 @@ DEBUG_CODE_END();
   @return EFI_OUT_OF_RESOURCES  a memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ParseCommandLineToArgs(\r
   IN CONST CHAR16 *CommandLine,\r
   IN BOOLEAN      StripQuotation,\r
@@ -296,7 +293,6 @@ Done:
   @sa ParseCommandLineToArgs\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CreatePopulateInstallShellParametersProtocol (\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  **NewShellParameters,\r
   IN OUT BOOLEAN                        *RootShellInstance\r
@@ -438,7 +434,6 @@ CreatePopulateInstallShellParametersProtocol (
   @sa UninstallProtocolInterface\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CleanUpShellParametersProtocol (\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *NewShellParameters\r
   )\r
@@ -485,7 +480,6 @@ CleanUpShellParametersProtocol (
   @return An error upon failure.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 IsUnicodeFile(\r
   IN CONST CHAR16 *FileName\r
   )\r
@@ -520,7 +514,6 @@ IsUnicodeFile(
   @param[in, out] TheString  A pointer to the string to update.\r
 **/\r
 VOID\r
-EFIAPI\r
 StripQuotes (\r
   IN OUT CHAR16 *TheString\r
   )\r
@@ -572,7 +565,6 @@ CalculateEfiHdrCrc (
   @return       The modified FileName.\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 FixFileName (\r
   IN CHAR16 *FileName\r
   )\r
@@ -615,7 +607,6 @@ FixFileName (
   @return       The modified FileName.\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 FixVarName (\r
   IN CHAR16 *FileName\r
   )\r
@@ -644,7 +635,6 @@ FixVarName (
   @retval EFI_SUCCESS   The unicode file tag has been moved successfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RemoveFileTag(\r
   IN SHELL_FILE_HANDLE *Handle\r
   )\r
@@ -708,7 +698,6 @@ WriteFileTag (
   @retval   EFI_OUT_OF_RESOURCES        A memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 UpdateStdInStdOutStdErr(\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN CHAR16                             *NewCommandLine,\r
@@ -1308,7 +1297,6 @@ UpdateStdInStdOutStdErr(
   @param[in] SystemTableInfo           Pointer to old system table information.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RestoreStdInStdOutStdErr (\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN  SHELL_FILE_HANDLE                 *OldStdIn,\r
@@ -1385,7 +1373,6 @@ RestoreStdInStdOutStdErr (
   @retval   EFI_OUT_OF_RESOURCES        A memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 UpdateArgcArgv(\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN CONST CHAR16                       *NewCommandLine,\r
@@ -1427,7 +1414,6 @@ UpdateArgcArgv(
   @param[in] OldArgc                    pointer to old number of items in Argv list\r
 **/\r
 VOID\r
-EFIAPI\r
 RestoreArgcArgv(\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN CHAR16                             ***OldArgv,\r

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.h b/ShellPkg/Application/Shell/ShellParametersProtocol.h
index 926f36242cdee50e152e33d7419a700dac6e7cf0..61cabca2c2fc2a8a40be63862e60a49b2aeebfa9 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.h
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.h
@@ -43,7 +43,6 @@ typedef enum {
   @sa ParseCommandLineToArgs\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CreatePopulateInstallShellParametersProtocol (\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  **NewShellParameters,\r
   IN OUT BOOLEAN                        *RootShellInstance\r
@@ -62,7 +61,6 @@ CreatePopulateInstallShellParametersProtocol (
   @sa UninstallProtocolInterface\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CleanUpShellParametersProtocol (\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *NewShellParameters\r
   );\r
@@ -82,7 +80,6 @@ CleanUpShellParametersProtocol (
   @retval   EFI_OUT_OF_RESOURCES        a memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 UpdateArgcArgv(\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN CONST CHAR16                       *NewCommandLine,\r
@@ -101,7 +98,6 @@ UpdateArgcArgv(
   @param[in] OldArgc                    pointer to old number of items in Argv list\r
 **/\r
 VOID\r
-EFIAPI\r
 RestoreArgcArgv(\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN CHAR16                             ***OldArgv,\r
@@ -135,7 +131,6 @@ typedef struct {
   @retval   EFI_OUT_OF_RESOURCES        A memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 UpdateStdInStdOutStdErr(\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN CHAR16                             *NewCommandLine,\r
@@ -156,7 +151,6 @@ UpdateStdInStdOutStdErr(
   @param[in] SystemTableInfo           Pointer to old system table information.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RestoreStdInStdOutStdErr (\r
   IN OUT EFI_SHELL_PARAMETERS_PROTOCOL  *ShellParameters,\r
   IN  SHELL_FILE_HANDLE                 *OldStdIn,\r
@@ -182,7 +176,6 @@ RestoreStdInStdOutStdErr (
   @return EFI_OUT_OF_RESOURCES  a memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ParseCommandLineToArgs(\r
   IN CONST CHAR16 *CommandLine,\r
   IN BOOLEAN      StripQuotation,\r
@@ -211,7 +204,6 @@ ParseCommandLineToArgs(
   @return   EFI_NOT_FOUND         A closing " could not be found on the specified string\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetNextParameter(\r
   IN OUT CHAR16   **Walker,\r
   IN OUT CHAR16   **TempParameter,\r

diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index fb7dd84e5a9c5749dd543b81ec582380b8f7af7a..2bc0646b453d6111336fd3aa6c5a6a2bdcbc4bd0 100644 (file)
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -50,7 +50,6 @@ EfiShellClose (
   @retval FALSE     gEfiBlockIoProtocolGuid was not found.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 InternalShellProtocolIsBlockIoPresent(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
   )\r
@@ -80,7 +79,6 @@ InternalShellProtocolIsBlockIoPresent(
   @retval FALSE     gEfiSimpleFileSystemProtocolGuid was not found.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 InternalShellProtocolIsSimpleFileSystemPresent(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
   )\r
@@ -113,7 +111,6 @@ InternalShellProtocolIsSimpleFileSystemPresent(
   @sa OpenProtocol\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalShellProtocolDebugPrintMessage (\r
   IN CONST CHAR16                   *Mapping,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
@@ -951,7 +948,6 @@ EfiShellBatchIsActive (
   @retval other                   an error ocurred.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalOpenFileDevicePath(\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
   OUT SHELL_FILE_HANDLE           *FileHandle,\r
@@ -1183,7 +1179,7 @@ EfiShellCreateFile(
   @retval EFI_ACCESS_DENIED       Guid already is assigned a name.\r
 **/\r
 EFI_STATUS\r
-EFIAPI \r
+EFIAPI\r
 EfiShellRegisterGuidName(\r
   IN CONST EFI_GUID *Guid,\r
   IN CONST CHAR16   *GuidName\r
@@ -1430,7 +1426,6 @@ EfiShellEnablePageBreak (
   @retval EFI_UNSUPPORTED   Nested shell invocations are not allowed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalShellExecuteDevicePath(\r
   IN CONST EFI_HANDLE               *ParentImageHandle,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
@@ -1639,7 +1634,6 @@ FreeAlloc:
   @retval EFI_UNSUPPORTED   Nested shell invocations are not allowed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalShellExecute(\r
   IN CONST CHAR16                   *CommandLine OPTIONAL,\r
   IN CONST CHAR16                   **Environment OPTIONAL,\r
@@ -1683,7 +1677,6 @@ InternalShellExecute(
 **/\r
 STATIC\r
 BOOLEAN\r
-EFIAPI\r
 NestingEnabled(\r
 )\r
 {\r
@@ -1822,7 +1815,6 @@ EfiShellExecute(
   @param FileListNode     pointer to the list node to free\r
 **/\r
 VOID\r
-EFIAPI\r
 InternalFreeShellFileInfoNode(\r
   IN EFI_SHELL_FILE_INFO *FileListNode\r
   )\r
@@ -1950,7 +1942,6 @@ typedef struct {
   @return != NULL     a pointer to the new node\r
 **/\r
 EFI_SHELL_FILE_INFO*\r
-EFIAPI\r
 InternalDuplicateShellFileInfo(\r
   IN       EFI_SHELL_FILE_INFO *Node,\r
   IN BOOLEAN                   Save\r
@@ -2003,7 +1994,6 @@ InternalDuplicateShellFileInfo(
   @return                     a pointer to the newly allocated structure.\r
 **/\r
 EFI_SHELL_FILE_INFO *\r
-EFIAPI\r
 CreateAndPopulateShellFileInfo(\r
   IN CONST CHAR16 *BasePath,\r
   IN CONST EFI_STATUS Status,\r
@@ -2201,7 +2191,7 @@ EfiShellFindFilesInDir(
   @retval EFI_NOT_FOUND           GuidName is not a known GUID Name.\r
 **/\r
 EFI_STATUS\r
-EFIAPI \r
+EFIAPI\r
 EfiShellGetGuidFromName(\r
   IN  CONST CHAR16   *GuidName,\r
   OUT       EFI_GUID *Guid\r
@@ -2241,7 +2231,7 @@ EfiShellGetGuidFromName(
   @retval EFI_NOT_FOUND           Guid is not assigned a name.\r
 **/\r
 EFI_STATUS\r
-EFIAPI \r
+EFIAPI\r
 EfiShellGetGuidName(\r
   IN  CONST EFI_GUID *Guid,\r
   OUT CONST CHAR16   **GuidName\r
@@ -2274,7 +2264,6 @@ EfiShellGetGuidName(
   @retval EFI_OUT_OF_RESOURCES\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 UpdateFileName(\r
   IN CONST CHAR16 *BasePath,\r
   IN OUT CHAR16   **Path\r
@@ -2335,7 +2324,6 @@ UpdateFileName(
   @retval EFI_OUT_OF_RESOURCES  a memory allocation failed\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ShellSearchHandle(\r
   IN     CONST CHAR16                         *FilePattern,\r
   IN           EFI_UNICODE_COLLATION_PROTOCOL *UnicodeCollation,\r
@@ -2726,7 +2714,7 @@ EfiShellOpenFileList(
                                 pointer does not need to be freed by the caller.\r
 **/\r
 CONST CHAR16 *\r
-EFIAPI \r
+EFIAPI\r
 EfiShellGetEnvEx(\r
   IN  CONST CHAR16 *Name,\r
   OUT       UINT32 *Attributes OPTIONAL\r
@@ -2863,7 +2851,6 @@ EfiShellGetEnv(
   @retval EFI_SUCCESS           The environment variable was successfully updated.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalEfiShellSetEnv(\r
   IN CONST CHAR16 *Name,\r
   IN CONST CHAR16 *Value,\r
@@ -3297,7 +3284,6 @@ EfiShellIsRootShell(
   @return !NULL   a list of all alias'\r
 **/\r
 CHAR16 *\r
-EFIAPI\r
 InternalEfiShellGetListAlias(\r
   )\r
 {\r
@@ -3469,7 +3455,6 @@ EfiShellGetAlias(
   @retval EFI_NOT_FOUND         the Alias intended to be deleted was not found\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalSetAlias(\r
   IN CONST CHAR16 *Command,\r
   IN CONST CHAR16 *Alias,\r
@@ -3633,7 +3618,6 @@ EFI_SHELL_PROTOCOL         mShellProtocol = {
   @return                 An error from LocateHandle, CreateEvent, or other core function.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CreatePopulateInstallShellProtocol (\r
   IN OUT EFI_SHELL_PROTOCOL  **NewShell\r
   )\r
@@ -3873,7 +3857,6 @@ NotificationFunction(
   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InernalEfiShellStartMonitor(\r
   VOID\r
   )\r

diff --git a/ShellPkg/Application/Shell/ShellProtocol.h b/ShellPkg/Application/Shell/ShellProtocol.h
index 4f701cb74976736f5f607cc38d709e0edcd2efaa..755a402c984e61a591ec2539b205c2e3cf77439e 100644 (file)
--- a/ShellPkg/Application/Shell/ShellProtocol.h
+++ b/ShellPkg/Application/Shell/ShellProtocol.h
@@ -43,7 +43,6 @@ typedef struct {
   @return                 An error from LocateHandle, CreateEvent, or other core function.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CreatePopulateInstallShellProtocol (\r
   IN OUT EFI_SHELL_PROTOCOL  **NewShell\r
   );\r
@@ -294,7 +293,6 @@ EfiShellBatchIsActive (
   @retval other                   an error ocurred.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalOpenFileDevicePath(\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL *DevicePath2,\r
   OUT SHELL_FILE_HANDLE             *FileHandle,\r
@@ -464,7 +462,6 @@ EfiShellEnablePageBreak (
   @retval EFI_UNSUPPORTED   Nested shell invocations are not allowed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalShellExecuteDevicePath(\r
   IN CONST EFI_HANDLE               *ParentImageHandle,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
@@ -522,7 +519,6 @@ EfiShellExecute(
   @param FileListNode     pointer to the list node to free\r
 **/\r
 VOID\r
-EFIAPI\r
 FreeShellFileInfoNode(\r
   IN EFI_SHELL_FILE_INFO *FileListNode\r
   );\r
@@ -573,7 +569,6 @@ EfiShellRemoveDupInFileList(
 \r
 **/\r
 EFI_SHELL_FILE_INFO *\r
-EFIAPI\r
 CreateAndPopulateShellFileInfo(\r
   IN CONST CHAR16 *BasePath,\r
   IN CONST EFI_STATUS Status,\r
@@ -856,7 +851,6 @@ EfiShellGetAlias(
   @retval EFI_NOT_FOUND         the Alias intended to be deleted was not found\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalSetAlias(\r
   IN CONST CHAR16 *Command,\r
   IN CONST CHAR16 *Alias OPTIONAL,\r
@@ -901,7 +895,6 @@ EfiShellSetAlias(
   @param FileListNode     pointer to the list node to free\r
 **/\r
 VOID\r
-EFIAPI\r
 InternalFreeShellFileInfoNode(\r
   IN EFI_SHELL_FILE_INFO *FileListNode\r
   );\r
@@ -917,7 +910,6 @@ InternalFreeShellFileInfoNode(
   @retval EFI_SUCCESS           The environment variable was successfully updated.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InternalEfiShellSetEnv(\r
   IN CONST CHAR16 *Name,\r
   IN CONST CHAR16 *Value,\r
@@ -932,7 +924,6 @@ InternalEfiShellSetEnv(
   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 InernalEfiShellStartMonitor(\r
   VOID\r
   );\r