* [PATCH 01/11] ShellPkg/Shell: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 02/11] ShellPkg/UefiShellDebug1CommandsLib: " Ruiyu Ni
` (11 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Application/Shell/ConsoleLogger.c | 10 ------
ShellPkg/Application/Shell/ConsoleLogger.h | 6 ----
ShellPkg/Application/Shell/ConsoleWrappers.c | 4 ---
ShellPkg/Application/Shell/ConsoleWrappers.h | 4 ---
ShellPkg/Application/Shell/FileHandleInternal.h | 3 --
ShellPkg/Application/Shell/FileHandleWrappers.c | 6 ----
ShellPkg/Application/Shell/FileHandleWrappers.h | 2 --
ShellPkg/Application/Shell/Shell.c | 36 ----------------------
ShellPkg/Application/Shell/Shell.h | 16 ----------
ShellPkg/Application/Shell/ShellEnvVar.c | 4 ---
ShellPkg/Application/Shell/ShellEnvVar.h | 4 ---
ShellPkg/Application/Shell/ShellManParser.c | 9 ------
ShellPkg/Application/Shell/ShellManParser.h | 2 --
.../Application/Shell/ShellParametersProtocol.c | 14 ---------
.../Application/Shell/ShellParametersProtocol.h | 8 -----
ShellPkg/Application/Shell/ShellProtocol.c | 25 +++------------
ShellPkg/Application/Shell/ShellProtocol.h | 9 ------
17 files changed, 4 insertions(+), 158 deletions(-)
diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c b/ShellPkg/Application/Shell/ConsoleLogger.c
index 9b64303..b1536e3 100644
--- a/ShellPkg/Application/Shell/ConsoleLogger.c
+++ b/ShellPkg/Application/Shell/ConsoleLogger.c
@@ -28,7 +28,6 @@
@sa InstallProtocolInterface
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerInstall(
IN CONST UINTN ScreensToSave,
OUT CONSOLE_LOGGER_PRIVATE_DATA **ConsoleInfo
@@ -104,7 +103,6 @@ ConsoleLoggerInstall(
@return other The operation failed. This was from UninstallProtocolInterface.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerUninstall(
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
)
@@ -142,7 +140,6 @@ ConsoleLoggerUninstall(
@param[in] ConsoleInfo The pointer to the instance of the console logger information.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerDisplayHistory(
IN CONST BOOLEAN Forward,
IN CONST UINTN Rows,
@@ -218,7 +215,6 @@ ConsoleLoggerDisplayHistory(
@sa UpdateDisplayFromHistory
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerStopHistory(
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
)
@@ -245,7 +241,6 @@ ConsoleLoggerStopHistory(
@return other The operation failed.
**/
EFI_STATUS
-EFIAPI
UpdateDisplayFromHistory(
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
)
@@ -434,7 +429,6 @@ ConsoleLoggerReset (
@param[in] ConsoleInfo The pointer to the instance of the console logger information.
**/
EFI_STATUS
-EFIAPI
AppendStringToHistory(
IN CONST CHAR16 *String,
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -589,7 +583,6 @@ AppendStringToHistory(
rendered and were skipped.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerOutputStringSplit(
IN CONST CHAR16 *String,
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -618,7 +611,6 @@ ConsoleLoggerOutputStringSplit(
@return other Break was choosen
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerDoPageBreak(
VOID
)
@@ -677,7 +669,6 @@ ConsoleLoggerDoPageBreak(
rendered and were skipped.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerPrintWithPageBreak(
IN CONST CHAR16 *String,
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
@@ -1188,7 +1179,6 @@ ConsoleLoggerEnableCursor (
history buffers.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerResetBuffers(
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
)
diff --git a/ShellPkg/Application/Shell/ConsoleLogger.h b/ShellPkg/Application/Shell/ConsoleLogger.h
index 19034c9..881c24b 100644
--- a/ShellPkg/Application/Shell/ConsoleLogger.h
+++ b/ShellPkg/Application/Shell/ConsoleLogger.h
@@ -58,7 +58,6 @@ typedef struct _CONSOLE_LOGGER_PRIVATE_DATA{
@sa InstallProtocolInterface
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerInstall(
IN CONST UINTN ScreensToSave,
OUT CONSOLE_LOGGER_PRIVATE_DATA **ConsoleInfo
@@ -74,7 +73,6 @@ ConsoleLoggerInstall(
@return other The operation failed. This was from UninstallProtocolInterface.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerUninstall(
IN OUT CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
);
@@ -92,7 +90,6 @@ ConsoleLoggerUninstall(
@param[in] ConsoleInfo The pointer to the instance of the console logger information.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerDisplayHistory(
IN CONST BOOLEAN Forward,
IN CONST UINTN Rows,
@@ -109,7 +106,6 @@ ConsoleLoggerDisplayHistory(
@sa UpdateDisplayFromHistory
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerStopHistory(
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
);
@@ -122,7 +118,6 @@ ConsoleLoggerStopHistory(
@return other The operation failed.
**/
EFI_STATUS
-EFIAPI
UpdateDisplayFromHistory(
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
);
@@ -320,7 +315,6 @@ ConsoleLoggerEnableCursor (
history buffers.
**/
EFI_STATUS
-EFIAPI
ConsoleLoggerResetBuffers(
IN CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo
);
diff --git a/ShellPkg/Application/Shell/ConsoleWrappers.c b/ShellPkg/Application/Shell/ConsoleWrappers.c
index 46af141..e1846ec 100644
--- 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;
**/
EFI_SIMPLE_TEXT_INPUT_PROTOCOL*
-EFIAPI
CreateSimpleTextInOnFile(
IN SHELL_FILE_HANDLE FileHandleToUse,
IN EFI_HANDLE *HandleLocation
@@ -200,7 +199,6 @@ CreateSimpleTextInOnFile(
@retval EFI_SUCCESS The object was closed.
**/
EFI_STATUS
-EFIAPI
CloseSimpleTextInOnFile(
IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *SimpleTextIn
)
@@ -434,7 +432,6 @@ FileBasedSimpleTextOutOutputString (
@return A pointer to the allocated protocol structure;
**/
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*
-EFIAPI
CreateSimpleTextOutOnFile(
IN SHELL_FILE_HANDLE FileHandleToUse,
IN EFI_HANDLE *HandleLocation,
@@ -499,7 +496,6 @@ CreateSimpleTextOutOnFile(
@retval EFI_SUCCESS The object was closed.
**/
EFI_STATUS
-EFIAPI
CloseSimpleTextOutOnFile(
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *SimpleTextOut
)
diff --git a/ShellPkg/Application/Shell/ConsoleWrappers.h b/ShellPkg/Application/Shell/ConsoleWrappers.h
index ecd99a8..35f3a71 100644
--- a/ShellPkg/Application/Shell/ConsoleWrappers.h
+++ b/ShellPkg/Application/Shell/ConsoleWrappers.h
@@ -27,7 +27,6 @@
@return A pointer to the allocated protocol structure;
**/
EFI_SIMPLE_TEXT_INPUT_PROTOCOL*
-EFIAPI
CreateSimpleTextInOnFile(
IN SHELL_FILE_HANDLE FileHandleToUse,
IN EFI_HANDLE *HandleLocation
@@ -42,7 +41,6 @@ CreateSimpleTextInOnFile(
@retval EFI_SUCCESS The object was closed.
**/
EFI_STATUS
-EFIAPI
CloseSimpleTextInOnFile(
IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *SimpleTextIn
);
@@ -59,7 +57,6 @@ CloseSimpleTextInOnFile(
@return A pointer to the allocated protocol structure;
**/
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL*
-EFIAPI
CreateSimpleTextOutOnFile(
IN SHELL_FILE_HANDLE FileHandleToUse,
IN EFI_HANDLE *HandleLocation,
@@ -75,7 +72,6 @@ CreateSimpleTextOutOnFile(
@retval EFI_SUCCESS The object was closed.
**/
EFI_STATUS
-EFIAPI
CloseSimpleTextOutOnFile(
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *SimpleTextOut
);
diff --git a/ShellPkg/Application/Shell/FileHandleInternal.h b/ShellPkg/Application/Shell/FileHandleInternal.h
index 11b4902..1e51980 100644
--- 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
**/
VOID
-EFIAPI
MoveCursorBackward (
IN UINTN LineLength,
IN OUT UINTN *Column,
@@ -39,7 +38,6 @@ MoveCursorBackward (
@param[in, out] Row Current row of the cursor position
**/
VOID
-EFIAPI
MoveCursorForward (
IN UINTN LineLength,
IN UINTN TotalRow,
@@ -57,7 +55,6 @@ MoveCursorForward (
@param[in] StartColumn which column to start at
**/
VOID
-EFIAPI
PrintCommandHistory (
IN CONST UINTN TotalCols,
IN CONST UINTN TotalRows,
diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c b/ShellPkg/Application/Shell/FileHandleWrappers.c
index 0d38e9d..9a75a68 100644
--- 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.
**/
EFI_STATUS
-EFIAPI
CreateTabCompletionList (
IN CONST CHAR16 *InputString,
IN CONST UINTN StringLen,
@@ -1227,7 +1226,6 @@ FileInterfaceEnvNonVolWrite(
@return other a pointer to an EFI_FILE_PROTOCOL structure
**/
EFI_FILE_PROTOCOL*
-EFIAPI
CreateFileInterfaceEnv(
IN CONST CHAR16 *EnvName
)
@@ -1290,7 +1288,6 @@ CreateFileInterfaceEnv(
@param[in, out] Row Current row of the cursor position
**/
VOID
-EFIAPI
MoveCursorBackward (
IN UINTN LineLength,
IN OUT UINTN *Column,
@@ -1320,7 +1317,6 @@ MoveCursorBackward (
@param[in, out] Row Current row of the cursor position
**/
VOID
-EFIAPI
MoveCursorForward (
IN UINTN LineLength,
IN UINTN TotalRow,
@@ -1352,7 +1348,6 @@ MoveCursorForward (
@param[in] StartColumn which column to start at
**/
VOID
-EFIAPI
PrintCommandHistory (
IN CONST UINTN TotalCols,
IN CONST UINTN TotalRows,
@@ -1576,7 +1571,6 @@ FileInterfaceMemClose(
@return other A pointer to an EFI_FILE_PROTOCOL structure.
**/
EFI_FILE_PROTOCOL*
-EFIAPI
CreateFileInterfaceMem(
IN CONST BOOLEAN Unicode
)
diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.h b/ShellPkg/Application/Shell/FileHandleWrappers.h
index af133b0..9034d69 100644
--- 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
**/
EFI_FILE_PROTOCOL*
-EFIAPI
CreateFileInterfaceEnv(
CONST CHAR16 *EnvName
);
@@ -70,7 +69,6 @@ CreateFileInterfaceEnv(
@return other a pointer to an EFI_FILE_PROTOCOL structure
**/
EFI_FILE_PROTOCOL*
-EFIAPI
CreateFileInterfaceMem(
IN CONST BOOLEAN Unicode
);
diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 0b6362e..b39d81d 100644
--- 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.
**/
EFI_STATUS
-EFIAPI
TrimSpaces(
IN CHAR16 **String
)
@@ -113,7 +112,6 @@ TrimSpaces(
@param[in] CheckForEscapeCharacter TRUE to skip escaped instances of FinfString, otherwise will return even escaped instances
**/
CHAR16*
-EFIAPI
FindNextInstance(
IN CONST CHAR16 *SourceString,
IN CONST CHAR16 *FindString,
@@ -202,7 +200,6 @@ IsValidEnvironmentVariableName(
@retval FALSE CmdLine does not have a valid split.
**/
BOOLEAN
-EFIAPI
ContainsSplit(
IN CONST CHAR16 *CmdLine
)
@@ -252,7 +249,6 @@ ContainsSplit(
@retval EFI_OUT_OF_RESOURCES There is not enough memory available.
**/
EFI_STATUS
-EFIAPI
InternalEfiShellStartCtrlSMonitor(
VOID
)
@@ -729,7 +725,6 @@ FreeResources:
@retval EFI_SUCCESS all init commands were run successfully.
**/
EFI_STATUS
-EFIAPI
SetBuiltInAlias(
)
{
@@ -768,7 +763,6 @@ SetBuiltInAlias(
@retval FALSE The 2 command names are not the same.
**/
BOOLEAN
-EFIAPI
IsCommand(
IN CONST CHAR16 *Command1,
IN CONST CHAR16 *Command2
@@ -789,7 +783,6 @@ IsCommand(
@retval FALSE The command is not a script only command.
**/
BOOLEAN
-EFIAPI
IsScriptOnlyCommand(
IN CONST CHAR16 *CommandName
)
@@ -820,7 +813,6 @@ IsScriptOnlyCommand(
@sa HandleProtocol
**/
EFI_STATUS
-EFIAPI
GetDevicePathsForImageAndFile (
IN OUT EFI_DEVICE_PATH_PROTOCOL **DevPath,
IN OUT EFI_DEVICE_PATH_PROTOCOL **FilePath
@@ -896,7 +888,6 @@ GetDevicePathsForImageAndFile (
@retval EFI_SUCCESS The variable is initialized.
**/
EFI_STATUS
-EFIAPI
ProcessCommandLine(
VOID
)
@@ -1103,7 +1094,6 @@ ProcessCommandLine(
@retval EFI_SUCCESS the variable is initialized.
**/
EFI_STATUS
-EFIAPI
DoStartupScript(
IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,
IN EFI_DEVICE_PATH_PROTOCOL *FilePath
@@ -1251,7 +1241,6 @@ DoStartupScript(
@retval RETURN_ABORTED
**/
EFI_STATUS
-EFIAPI
DoShellPrompt (
VOID
)
@@ -1318,7 +1307,6 @@ DoShellPrompt (
@param Buffer Something to pass to FreePool when the shell is exiting.
**/
VOID*
-EFIAPI
AddBufferToFreeList (
VOID *Buffer
)
@@ -1375,7 +1363,6 @@ RestoreBufferList (
@param Buffer The line buffer to add.
**/
VOID
-EFIAPI
AddLineToCommandHistory(
IN CONST CHAR16 *Buffer
)
@@ -1437,7 +1424,6 @@ AddLineToCommandHistory(
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
ShellConvertAlias(
IN OUT CHAR16 **CommandString
)
@@ -1462,7 +1448,6 @@ ShellConvertAlias(
@param[in,out] CmdLine The command line to update.
**/
EFI_STATUS
-EFIAPI
StripUnreplacedEnvironmentVariables(
IN OUT CHAR16 *CmdLine
)
@@ -1535,7 +1520,6 @@ StripUnreplacedEnvironmentVariables(
@return The new command line with no environment variables present.
**/
CHAR16*
-EFIAPI
ShellConvertVariables (
IN CONST CHAR16 *OriginalCommandLine
)
@@ -1671,7 +1655,6 @@ ShellConvertVariables (
@retval other Some error occurs when executing the split command.
**/
EFI_STATUS
-EFIAPI
RunSplitCommand(
IN CONST CHAR16 *CmdLine,
IN SHELL_FILE_HANDLE *StdIn,
@@ -1790,7 +1773,6 @@ RunSplitCommand(
@retval EFI_OUT_OF_RESOURCES a memory allocation failed.
**/
EFI_STATUS
-EFIAPI
ShellSubstituteVariables(
IN CHAR16 **CmdLine
)
@@ -1815,7 +1797,6 @@ ShellSubstituteVariables(
@retval EFI_OUT_OF_RESOURCES a memory allocation failed.
**/
EFI_STATUS
-EFIAPI
ShellSubstituteAliases(
IN CHAR16 **CmdLine
)
@@ -1887,7 +1868,6 @@ ShellSubstituteAliases(
@retval Efi_Application the name is an application (.EFI).
**/
SHELL_OPERATION_TYPES
-EFIAPI
GetOperationType(
IN CONST CHAR16 *CmdName
)
@@ -1956,7 +1936,6 @@ GetOperationType(
@retval EFI_NOT_FOUND The operation type is unknown or invalid.
**/
EFI_STATUS
-EFIAPI
IsValidSplit(
IN CONST CHAR16 *CmdLine
)
@@ -2015,7 +1994,6 @@ IsValidSplit(
@retval EFI_ABORTED CmdLine has at least one invalid command or application.
**/
EFI_STATUS
-EFIAPI
VerifySplit(
IN CONST CHAR16 *CmdLine
)
@@ -2061,7 +2039,6 @@ VerifySplit(
@return an error occurred.
**/
EFI_STATUS
-EFIAPI
ProcessNewSplitCommandLine(
IN CONST CHAR16 *CmdLine
)
@@ -2102,7 +2079,6 @@ ProcessNewSplitCommandLine(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ChangeMappedDrive(
IN CONST CHAR16 *CmdLine
)
@@ -2138,7 +2114,6 @@ ChangeMappedDrive(
@param[in,out] CmdLine pointer to the command line to update
**/
EFI_STATUS
-EFIAPI
DoHelpUpdate(
IN OUT CHAR16 **CmdLine
)
@@ -2192,7 +2167,6 @@ DoHelpUpdate(
@param[in] ErrorCode the error code to put into lasterror.
**/
EFI_STATUS
-EFIAPI
SetLastError(
IN CONST SHELL_STATUS ErrorCode
)
@@ -2219,7 +2193,6 @@ SetLastError(
@return some other error occurred
**/
EFI_STATUS
-EFIAPI
ProcessCommandLineToFinal(
IN OUT CHAR16 **CmdLine
)
@@ -2272,7 +2245,6 @@ ProcessCommandLineToFinal(
@retval EFI_ABORTED The command's operation was aborted.
**/
EFI_STATUS
-EFIAPI
RunInternalCommand(
IN CONST CHAR16 *CmdLine,
IN CHAR16 *FirstParameter,
@@ -2385,7 +2357,6 @@ RunInternalCommand(
@retval EFI_ABORTED The command's operation was aborted.
**/
EFI_STATUS
-EFIAPI
RunCommandOrFile(
IN SHELL_OPERATION_TYPES Type,
IN CONST CHAR16 *CmdLine,
@@ -2515,7 +2486,6 @@ RunCommandOrFile(
@retval EFI_ABORTED The command's operation was aborted.
**/
EFI_STATUS
-EFIAPI
SetupAndRunCommandOrFile(
IN SHELL_OPERATION_TYPES Type,
IN CHAR16 *CmdLine,
@@ -2578,7 +2548,6 @@ SetupAndRunCommandOrFile(
@retval EFI_ABORTED The command's operation was aborted.
**/
EFI_STATUS
-EFIAPI
RunShellCommand(
IN CONST CHAR16 *CmdLine,
OUT EFI_STATUS *CommandStatus
@@ -2699,7 +2668,6 @@ RunShellCommand(
@retval EFI_ABORTED The command's operation was aborted.
**/
EFI_STATUS
-EFIAPI
RunCommand(
IN CONST CHAR16 *CmdLine
)
@@ -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
**/
BOOLEAN
-EFIAPI
IsValidCommandName(
IN CONST CHAR16 *CommandName
)
@@ -2749,7 +2716,6 @@ IsValidCommandName(
@retval EFI_SUCCESS the script completed successfully
**/
EFI_STATUS
-EFIAPI
RunScriptFileHandle (
IN SHELL_FILE_HANDLE Handle,
IN CONST CHAR16 *Name
@@ -3067,7 +3033,6 @@ RunScriptFileHandle (
@retval EFI_SUCCESS the script completed successfully
**/
EFI_STATUS
-EFIAPI
RunScriptFile (
IN CONST CHAR16 *ScriptPath,
IN SHELL_FILE_HANDLE Handle OPTIONAL,
@@ -3131,7 +3096,6 @@ RunScriptFile (
@retval CHAR_NULL no instance of any character in CharacterList was found in String
**/
CONST CHAR16*
-EFIAPI
FindFirstCharacter(
IN CONST CHAR16 *String,
IN CONST CHAR16 *CharacterList,
diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h
index 29b36b0..a93ea60 100644
--- 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
**/
EFI_STATUS
-EFIAPI
ProcessCommandLineToFinal(
IN OUT CHAR16 **CmdLine
);
@@ -162,7 +161,6 @@ ProcessCommandLineToFinal(
@param[in] ErrorCode the error code to put into lasterror
**/
EFI_STATUS
-EFIAPI
SetLastError(
IN CONST SHELL_STATUS ErrorCode
);
@@ -173,7 +171,6 @@ SetLastError(
@retval EFI_SUCCESS all init commands were run successfully.
**/
EFI_STATUS
-EFIAPI
SetBuiltInAlias(
VOID
);
@@ -193,7 +190,6 @@ SetBuiltInAlias(
@sa HandleProtocol
**/
EFI_STATUS
-EFIAPI
GetDevicePathsForImageAndFile (
IN OUT EFI_DEVICE_PATH_PROTOCOL **DevPath,
IN OUT EFI_DEVICE_PATH_PROTOCOL **FilePath
@@ -227,7 +223,6 @@ GetDevicePathsForImageAndFile (
@retval EFI_SUCCESS the variable is initialized.
**/
EFI_STATUS
-EFIAPI
ProcessCommandLine(
VOID
);
@@ -243,7 +238,6 @@ ProcessCommandLine(
@retval EFI_SUCCESS The variable is initialized.
**/
EFI_STATUS
-EFIAPI
DoStartupScript(
IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,
IN EFI_DEVICE_PATH_PROTOCOL *FilePath
@@ -258,7 +252,6 @@ DoStartupScript(
@retval RETURN_ABORTED
**/
EFI_STATUS
-EFIAPI
DoShellPrompt (
VOID
);
@@ -270,7 +263,6 @@ DoShellPrompt (
@param Buffer Something to pass to FreePool when the shell is exiting.
**/
VOID*
-EFIAPI
AddBufferToFreeList(
VOID *Buffer
);
@@ -281,7 +273,6 @@ AddBufferToFreeList(
@param Buffer[in] The line buffer to add.
**/
VOID
-EFIAPI
AddLineToCommandHistory(
IN CONST CHAR16 *Buffer
);
@@ -297,7 +288,6 @@ AddLineToCommandHistory(
@retval EFI_ABORTED the command's operation was aborted
**/
EFI_STATUS
-EFIAPI
RunCommand(
IN CONST CHAR16 *CmdLine
);
@@ -315,7 +305,6 @@ RunCommand(
@retval EFI_ABORTED The command's operation was aborted.
**/
EFI_STATUS
-EFIAPI
RunShellCommand(
IN CONST CHAR16 *CmdLine,
OUT EFI_STATUS *CommandStatus
@@ -331,7 +320,6 @@ RunShellCommand(
@retval FALSE CommandName could not be a valid command name
**/
BOOLEAN
-EFIAPI
IsValidCommandName(
IN CONST CHAR16 *CommandName
);
@@ -345,7 +333,6 @@ IsValidCommandName(
@retval EFI_SUCCESS the script completed successfully
**/
EFI_STATUS
-EFIAPI
RunScriptFileHandle (
IN SHELL_FILE_HANDLE Handle,
IN CONST CHAR16 *Name
@@ -362,7 +349,6 @@ RunScriptFileHandle (
@retval EFI_SUCCESS the script completed successfully
**/
EFI_STATUS
-EFIAPI
RunScriptFile (
IN CONST CHAR16 *ScriptPath,
IN SHELL_FILE_HANDLE Handle OPTIONAL,
@@ -381,7 +367,6 @@ RunScriptFile (
@retval CHAR_NULL no instance of any character in CharacterList was found in String
**/
CONST CHAR16*
-EFIAPI
FindFirstCharacter(
IN CONST CHAR16 *String,
IN CONST CHAR16 *CharacterList,
@@ -394,7 +379,6 @@ FindFirstCharacter(
@param[in] String pointer to the string to trim them off.
**/
EFI_STATUS
-EFIAPI
TrimSpaces(
IN CHAR16 **String
);
diff --git a/ShellPkg/Application/Shell/ShellEnvVar.c b/ShellPkg/Application/Shell/ShellEnvVar.c
index 77bf599..6d8c79b 100644
--- 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.
**/
VOID
-EFIAPI
FreeEnvironmentVariableList(
IN LIST_ENTRY *List
)
@@ -128,7 +127,6 @@ FreeEnvironmentVariableList(
@retval EFI_SUCCESS the list was created sucessfully.
**/
EFI_STATUS
-EFIAPI
GetEnvironmentVariableList(
IN OUT LIST_ENTRY *ListHead
)
@@ -238,7 +236,6 @@ GetEnvironmentVariableList(
@retval EFI_SUCCESS the list was Set sucessfully.
**/
EFI_STATUS
-EFIAPI
SetEnvironmentVariableList(
IN LIST_ENTRY *ListHead
)
@@ -302,7 +299,6 @@ SetEnvironmentVariableList(
@sa SetEnvironmentVariableList
**/
EFI_STATUS
-EFIAPI
SetEnvironmentVariables(
IN CONST CHAR16 **Environment
)
diff --git a/ShellPkg/Application/Shell/ShellEnvVar.h b/ShellPkg/Application/Shell/ShellEnvVar.h
index f05ef2b..b9efed0 100644
--- 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.
**/
EFI_STATUS
-EFIAPI
GetEnvironmentVariableList(
IN OUT LIST_ENTRY *List
);
@@ -174,7 +173,6 @@ GetEnvironmentVariableList(
@retval EFI_SUCCESS The list was Set sucessfully.
**/
EFI_STATUS
-EFIAPI
SetEnvironmentVariableList(
IN LIST_ENTRY *List
);
@@ -195,7 +193,6 @@ SetEnvironmentVariableList(
@sa SetEnvironmentVariableList
**/
EFI_STATUS
-EFIAPI
SetEnvironmentVariables(
IN CONST CHAR16 **Environment
);
@@ -206,7 +203,6 @@ SetEnvironmentVariables(
@param[in] List The pointer to pointer to list.
**/
VOID
-EFIAPI
FreeEnvironmentVariableList(
IN LIST_ENTRY *List
);
diff --git a/ShellPkg/Application/Shell/ShellManParser.c b/ShellPkg/Application/Shell/ShellManParser.c
index 948759f..7a290e1 100644
--- a/ShellPkg/Application/Shell/ShellManParser.c
+++ b/ShellPkg/Application/Shell/ShellManParser.c
@@ -63,7 +63,6 @@ SHELL_MAN_HII_VENDOR_DEVICE_PATH mShellManHiiDevicePath = {
**/
CHAR16
-EFIAPI
InternalShellCharToUpper (
IN CHAR16 Char
);
@@ -79,7 +78,6 @@ InternalShellCharToUpper (
@return the new filename with .efi as the extension.
**/
CHAR16 *
-EFIAPI
GetExecuatableFileName (
IN CONST CHAR16 *NameString
)
@@ -132,7 +130,6 @@ GetExecuatableFileName (
@return the new filename with .man as the extension.
**/
CHAR16 *
-EFIAPI
GetManFileName(
IN CONST CHAR16 *ManFileName
)
@@ -179,7 +176,6 @@ GetManFileName(
@retval EFI_NOT_FOUND The file was not found.
**/
EFI_STATUS
-EFIAPI
SearchPathForFile(
IN CONST CHAR16 *FileName,
OUT SHELL_FILE_HANDLE *Handle
@@ -227,7 +223,6 @@ SearchPathForFile(
an alloceted buffer.
**/
EFI_STATUS
-EFIAPI
ManBufferFindSections(
IN CONST CHAR16 *Buffer,
IN CONST CHAR16 *Sections,
@@ -361,7 +356,6 @@ ManBufferFindSections(
an alloceted buffer.
**/
EFI_STATUS
-EFIAPI
ManFileFindSections(
IN SHELL_FILE_HANDLE Handle,
IN CONST CHAR16 *Sections,
@@ -475,7 +469,6 @@ ManFileFindSections(
an alloceted buffer.
**/
EFI_STATUS
-EFIAPI
ManBufferFindTitleSection(
IN CHAR16 **Buffer,
IN CONST CHAR16 *Command,
@@ -712,7 +705,6 @@ IsTitleHeader(
an allocated buffer if requested.
**/
EFI_STATUS
-EFIAPI
ManFileFindTitleSection(
IN SHELL_FILE_HANDLE Handle,
IN CONST CHAR16 *Command,
@@ -805,7 +797,6 @@ ManFileFindTitleSection(
@retval EFI_NOT_FOUND There is no help text available for Command.
**/
EFI_STATUS
-EFIAPI
ProcessManFile(
IN CONST CHAR16 *ManFileName,
IN CONST CHAR16 *Command,
diff --git a/ShellPkg/Application/Shell/ShellManParser.h b/ShellPkg/Application/Shell/ShellManParser.h
index 3807eec..bb530a3 100644
--- 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.
**/
EFI_STATUS
-EFIAPI
ProcessManFile(
IN CONST CHAR16 *ManFileName,
IN CONST CHAR16 *Command,
@@ -73,7 +72,6 @@ ProcessManFile(
an alloceted buffer.
**/
EFI_STATUS
-EFIAPI
ManFileFindSections(
IN SHELL_FILE_HANDLE Handle,
IN CONST CHAR16 *Sections,
diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 58156a2..4999155 100644
--- 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
**/
CONST CHAR16*
-EFIAPI
FindEndOfParameter(
IN CONST CHAR16 *String
)
@@ -86,7 +85,6 @@ FindEndOfParameter(
@return EFI_NOT_FOUND A closing " could not be found on the specified string
**/
EFI_STATUS
-EFIAPI
GetNextParameter(
IN OUT CHAR16 **Walker,
IN OUT CHAR16 **TempParameter,
@@ -196,7 +194,6 @@ DEBUG_CODE_END();
@return EFI_OUT_OF_RESOURCES a memory allocation failed.
**/
EFI_STATUS
-EFIAPI
ParseCommandLineToArgs(
IN CONST CHAR16 *CommandLine,
IN BOOLEAN StripQuotation,
@@ -296,7 +293,6 @@ Done:
@sa ParseCommandLineToArgs
**/
EFI_STATUS
-EFIAPI
CreatePopulateInstallShellParametersProtocol (
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL **NewShellParameters,
IN OUT BOOLEAN *RootShellInstance
@@ -438,7 +434,6 @@ CreatePopulateInstallShellParametersProtocol (
@sa UninstallProtocolInterface
**/
EFI_STATUS
-EFIAPI
CleanUpShellParametersProtocol (
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *NewShellParameters
)
@@ -485,7 +480,6 @@ CleanUpShellParametersProtocol (
@return An error upon failure.
**/
EFI_STATUS
-EFIAPI
IsUnicodeFile(
IN CONST CHAR16 *FileName
)
@@ -520,7 +514,6 @@ IsUnicodeFile(
@param[in, out] TheString A pointer to the string to update.
**/
VOID
-EFIAPI
StripQuotes (
IN OUT CHAR16 *TheString
)
@@ -572,7 +565,6 @@ CalculateEfiHdrCrc (
@return The modified FileName.
**/
CHAR16*
-EFIAPI
FixFileName (
IN CHAR16 *FileName
)
@@ -615,7 +607,6 @@ FixFileName (
@return The modified FileName.
**/
CHAR16*
-EFIAPI
FixVarName (
IN CHAR16 *FileName
)
@@ -644,7 +635,6 @@ FixVarName (
@retval EFI_SUCCESS The unicode file tag has been moved successfully.
**/
EFI_STATUS
-EFIAPI
RemoveFileTag(
IN SHELL_FILE_HANDLE *Handle
)
@@ -708,7 +698,6 @@ WriteFileTag (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
UpdateStdInStdOutStdErr(
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN CHAR16 *NewCommandLine,
@@ -1308,7 +1297,6 @@ UpdateStdInStdOutStdErr(
@param[in] SystemTableInfo Pointer to old system table information.
**/
EFI_STATUS
-EFIAPI
RestoreStdInStdOutStdErr (
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN SHELL_FILE_HANDLE *OldStdIn,
@@ -1385,7 +1373,6 @@ RestoreStdInStdOutStdErr (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
UpdateArgcArgv(
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN CONST CHAR16 *NewCommandLine,
@@ -1427,7 +1414,6 @@ UpdateArgcArgv(
@param[in] OldArgc pointer to old number of items in Argv list
**/
VOID
-EFIAPI
RestoreArgcArgv(
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN CHAR16 ***OldArgv,
diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.h b/ShellPkg/Application/Shell/ShellParametersProtocol.h
index 926f362..61cabca 100644
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.h
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.h
@@ -43,7 +43,6 @@ typedef enum {
@sa ParseCommandLineToArgs
**/
EFI_STATUS
-EFIAPI
CreatePopulateInstallShellParametersProtocol (
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL **NewShellParameters,
IN OUT BOOLEAN *RootShellInstance
@@ -62,7 +61,6 @@ CreatePopulateInstallShellParametersProtocol (
@sa UninstallProtocolInterface
**/
EFI_STATUS
-EFIAPI
CleanUpShellParametersProtocol (
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *NewShellParameters
);
@@ -82,7 +80,6 @@ CleanUpShellParametersProtocol (
@retval EFI_OUT_OF_RESOURCES a memory allocation failed.
**/
EFI_STATUS
-EFIAPI
UpdateArgcArgv(
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN CONST CHAR16 *NewCommandLine,
@@ -101,7 +98,6 @@ UpdateArgcArgv(
@param[in] OldArgc pointer to old number of items in Argv list
**/
VOID
-EFIAPI
RestoreArgcArgv(
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN CHAR16 ***OldArgv,
@@ -135,7 +131,6 @@ typedef struct {
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
UpdateStdInStdOutStdErr(
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN CHAR16 *NewCommandLine,
@@ -156,7 +151,6 @@ UpdateStdInStdOutStdErr(
@param[in] SystemTableInfo Pointer to old system table information.
**/
EFI_STATUS
-EFIAPI
RestoreStdInStdOutStdErr (
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,
IN SHELL_FILE_HANDLE *OldStdIn,
@@ -182,7 +176,6 @@ RestoreStdInStdOutStdErr (
@return EFI_OUT_OF_RESOURCES a memory allocation failed.
**/
EFI_STATUS
-EFIAPI
ParseCommandLineToArgs(
IN CONST CHAR16 *CommandLine,
IN BOOLEAN StripQuotation,
@@ -211,7 +204,6 @@ ParseCommandLineToArgs(
@return EFI_NOT_FOUND A closing " could not be found on the specified string
**/
EFI_STATUS
-EFIAPI
GetNextParameter(
IN OUT CHAR16 **Walker,
IN OUT CHAR16 **TempParameter,
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index fb7dd84..2bc0646 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -50,7 +50,6 @@ EfiShellClose (
@retval FALSE gEfiBlockIoProtocolGuid was not found.
**/
BOOLEAN
-EFIAPI
InternalShellProtocolIsBlockIoPresent(
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -80,7 +79,6 @@ InternalShellProtocolIsBlockIoPresent(
@retval FALSE gEfiSimpleFileSystemProtocolGuid was not found.
**/
BOOLEAN
-EFIAPI
InternalShellProtocolIsSimpleFileSystemPresent(
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -113,7 +111,6 @@ InternalShellProtocolIsSimpleFileSystemPresent(
@sa OpenProtocol
**/
EFI_STATUS
-EFIAPI
InternalShellProtocolDebugPrintMessage (
IN CONST CHAR16 *Mapping,
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
@@ -951,7 +948,6 @@ EfiShellBatchIsActive (
@retval other an error ocurred.
**/
EFI_STATUS
-EFIAPI
InternalOpenFileDevicePath(
IN OUT EFI_DEVICE_PATH_PROTOCOL *DevicePath,
OUT SHELL_FILE_HANDLE *FileHandle,
@@ -1183,7 +1179,7 @@ EfiShellCreateFile(
@retval EFI_ACCESS_DENIED Guid already is assigned a name.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
EfiShellRegisterGuidName(
IN CONST EFI_GUID *Guid,
IN CONST CHAR16 *GuidName
@@ -1430,7 +1426,6 @@ EfiShellEnablePageBreak (
@retval EFI_UNSUPPORTED Nested shell invocations are not allowed.
**/
EFI_STATUS
-EFIAPI
InternalShellExecuteDevicePath(
IN CONST EFI_HANDLE *ParentImageHandle,
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
@@ -1639,7 +1634,6 @@ FreeAlloc:
@retval EFI_UNSUPPORTED Nested shell invocations are not allowed.
**/
EFI_STATUS
-EFIAPI
InternalShellExecute(
IN CONST CHAR16 *CommandLine OPTIONAL,
IN CONST CHAR16 **Environment OPTIONAL,
@@ -1683,7 +1677,6 @@ InternalShellExecute(
**/
STATIC
BOOLEAN
-EFIAPI
NestingEnabled(
)
{
@@ -1822,7 +1815,6 @@ EfiShellExecute(
@param FileListNode pointer to the list node to free
**/
VOID
-EFIAPI
InternalFreeShellFileInfoNode(
IN EFI_SHELL_FILE_INFO *FileListNode
)
@@ -1950,7 +1942,6 @@ typedef struct {
@return != NULL a pointer to the new node
**/
EFI_SHELL_FILE_INFO*
-EFIAPI
InternalDuplicateShellFileInfo(
IN EFI_SHELL_FILE_INFO *Node,
IN BOOLEAN Save
@@ -2003,7 +1994,6 @@ InternalDuplicateShellFileInfo(
@return a pointer to the newly allocated structure.
**/
EFI_SHELL_FILE_INFO *
-EFIAPI
CreateAndPopulateShellFileInfo(
IN CONST CHAR16 *BasePath,
IN CONST EFI_STATUS Status,
@@ -2201,7 +2191,7 @@ EfiShellFindFilesInDir(
@retval EFI_NOT_FOUND GuidName is not a known GUID Name.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
EfiShellGetGuidFromName(
IN CONST CHAR16 *GuidName,
OUT EFI_GUID *Guid
@@ -2241,7 +2231,7 @@ EfiShellGetGuidFromName(
@retval EFI_NOT_FOUND Guid is not assigned a name.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
EfiShellGetGuidName(
IN CONST EFI_GUID *Guid,
OUT CONST CHAR16 **GuidName
@@ -2274,7 +2264,6 @@ EfiShellGetGuidName(
@retval EFI_OUT_OF_RESOURCES
**/
EFI_STATUS
-EFIAPI
UpdateFileName(
IN CONST CHAR16 *BasePath,
IN OUT CHAR16 **Path
@@ -2335,7 +2324,6 @@ UpdateFileName(
@retval EFI_OUT_OF_RESOURCES a memory allocation failed
**/
EFI_STATUS
-EFIAPI
ShellSearchHandle(
IN CONST CHAR16 *FilePattern,
IN EFI_UNICODE_COLLATION_PROTOCOL *UnicodeCollation,
@@ -2726,7 +2714,7 @@ EfiShellOpenFileList(
pointer does not need to be freed by the caller.
**/
CONST CHAR16 *
-EFIAPI
+EFIAPI
EfiShellGetEnvEx(
IN CONST CHAR16 *Name,
OUT UINT32 *Attributes OPTIONAL
@@ -2863,7 +2851,6 @@ EfiShellGetEnv(
@retval EFI_SUCCESS The environment variable was successfully updated.
**/
EFI_STATUS
-EFIAPI
InternalEfiShellSetEnv(
IN CONST CHAR16 *Name,
IN CONST CHAR16 *Value,
@@ -3297,7 +3284,6 @@ EfiShellIsRootShell(
@return !NULL a list of all alias'
**/
CHAR16 *
-EFIAPI
InternalEfiShellGetListAlias(
)
{
@@ -3469,7 +3455,6 @@ EfiShellGetAlias(
@retval EFI_NOT_FOUND the Alias intended to be deleted was not found
**/
EFI_STATUS
-EFIAPI
InternalSetAlias(
IN CONST CHAR16 *Command,
IN CONST CHAR16 *Alias,
@@ -3633,7 +3618,6 @@ EFI_SHELL_PROTOCOL mShellProtocol = {
@return An error from LocateHandle, CreateEvent, or other core function.
**/
EFI_STATUS
-EFIAPI
CreatePopulateInstallShellProtocol (
IN OUT EFI_SHELL_PROTOCOL **NewShell
)
@@ -3873,7 +3857,6 @@ NotificationFunction(
@retval EFI_OUT_OF_RESOURCES There is not enough mnemory available.
**/
EFI_STATUS
-EFIAPI
InernalEfiShellStartMonitor(
VOID
)
diff --git a/ShellPkg/Application/Shell/ShellProtocol.h b/ShellPkg/Application/Shell/ShellProtocol.h
index 4f701cb..755a402 100644
--- 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.
**/
EFI_STATUS
-EFIAPI
CreatePopulateInstallShellProtocol (
IN OUT EFI_SHELL_PROTOCOL **NewShell
);
@@ -294,7 +293,6 @@ EfiShellBatchIsActive (
@retval other an error ocurred.
**/
EFI_STATUS
-EFIAPI
InternalOpenFileDevicePath(
IN OUT EFI_DEVICE_PATH_PROTOCOL *DevicePath2,
OUT SHELL_FILE_HANDLE *FileHandle,
@@ -464,7 +462,6 @@ EfiShellEnablePageBreak (
@retval EFI_UNSUPPORTED Nested shell invocations are not allowed.
**/
EFI_STATUS
-EFIAPI
InternalShellExecuteDevicePath(
IN CONST EFI_HANDLE *ParentImageHandle,
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
@@ -522,7 +519,6 @@ EfiShellExecute(
@param FileListNode pointer to the list node to free
**/
VOID
-EFIAPI
FreeShellFileInfoNode(
IN EFI_SHELL_FILE_INFO *FileListNode
);
@@ -573,7 +569,6 @@ EfiShellRemoveDupInFileList(
**/
EFI_SHELL_FILE_INFO *
-EFIAPI
CreateAndPopulateShellFileInfo(
IN CONST CHAR16 *BasePath,
IN CONST EFI_STATUS Status,
@@ -856,7 +851,6 @@ EfiShellGetAlias(
@retval EFI_NOT_FOUND the Alias intended to be deleted was not found
**/
EFI_STATUS
-EFIAPI
InternalSetAlias(
IN CONST CHAR16 *Command,
IN CONST CHAR16 *Alias OPTIONAL,
@@ -901,7 +895,6 @@ EfiShellSetAlias(
@param FileListNode pointer to the list node to free
**/
VOID
-EFIAPI
InternalFreeShellFileInfoNode(
IN EFI_SHELL_FILE_INFO *FileListNode
);
@@ -917,7 +910,6 @@ InternalFreeShellFileInfoNode(
@retval EFI_SUCCESS The environment variable was successfully updated.
**/
EFI_STATUS
-EFIAPI
InternalEfiShellSetEnv(
IN CONST CHAR16 *Name,
IN CONST CHAR16 *Value,
@@ -932,7 +924,6 @@ InternalEfiShellSetEnv(
@retval EFI_OUT_OF_RESOURCES There is not enough mnemory available.
**/
EFI_STATUS
-EFIAPI
InernalEfiShellStartMonitor(
VOID
);
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 02/11] ShellPkg/UefiShellDebug1CommandsLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
2016-09-30 8:17 ` [PATCH 01/11] ShellPkg/Shell: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 03/11] ShellPkg/UefiShellDriver1CommandsLib: " Ruiyu Ni
` (10 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
.../Library/UefiShellDebug1CommandsLib/Compress.c | 30 ---------------
ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c | 1 -
ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 2 -
.../Library/UefiShellDebug1CommandsLib/DmpStore.c | 3 --
.../UefiShellDebug1CommandsLib/Edit/FileBuffer.c | 45 ----------------------
.../UefiShellDebug1CommandsLib/Edit/FileBuffer.h | 17 --------
.../Edit/MainTextEditor.c | 9 -----
.../Edit/MainTextEditor.h | 5 ---
.../Library/UefiShellDebug1CommandsLib/Edit/Misc.c | 2 -
.../Library/UefiShellDebug1CommandsLib/Edit/Misc.h | 2 -
.../UefiShellDebug1CommandsLib/EditInputBar.c | 7 ----
.../UefiShellDebug1CommandsLib/EditInputBar.h | 6 ---
.../UefiShellDebug1CommandsLib/EditMenuBar.c | 6 ---
.../UefiShellDebug1CommandsLib/EditMenuBar.h | 6 ---
.../UefiShellDebug1CommandsLib/EditStatusBar.c | 7 ----
.../UefiShellDebug1CommandsLib/EditStatusBar.h | 7 ----
.../UefiShellDebug1CommandsLib/EditTitleBar.c | 3 --
.../UefiShellDebug1CommandsLib/EditTitleBar.h | 3 --
.../HexEdit/BufferImage.c | 9 -----
.../HexEdit/BufferImage.h | 4 --
.../UefiShellDebug1CommandsLib/HexEdit/DiskImage.c | 1 -
.../HexEdit/MainHexEditor.c | 1 -
.../HexEdit/MainHexEditor.h | 1 -
.../UefiShellDebug1CommandsLib/LoadPciRom.c | 2 -
ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c | 1 -
ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c | 18 ---------
.../Library/UefiShellDebug1CommandsLib/SerMode.c | 1 -
.../Library/UefiShellDebug1CommandsLib/SetVar.c | 1 -
.../SmbiosView/EventLogInfo.c | 5 ---
.../SmbiosView/EventLogInfo.h | 5 ---
.../SmbiosView/SmbiosView.c | 8 ----
.../SmbiosView/SmbiosView.h | 7 ----
.../UefiShellDebug1CommandsLib.c | 9 -----
.../UefiShellDebug1CommandsLib.h | 7 ----
34 files changed, 241 deletions(-)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
index 2106185..dda2fed 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
@@ -68,7 +68,6 @@ typedef INT16 NODE;
@param[in] Data The dword to put.
**/
VOID
-EFIAPI
PutDword(
IN UINT32 Data
);
@@ -128,7 +127,6 @@ INT32 mHuffmanDepth = 0;
**/
VOID
-EFIAPI
MakeCrcTable (
VOID
)
@@ -159,7 +157,6 @@ MakeCrcTable (
@param[in] Data The dword to put.
**/
VOID
-EFIAPI
PutDword (
IN UINT32 Data
)
@@ -188,7 +185,6 @@ PutDword (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
AllocateMemory (
VOID
)
@@ -222,7 +218,6 @@ AllocateMemory (
**/
VOID
-EFIAPI
FreeMemory (
VOID
)
@@ -241,7 +236,6 @@ FreeMemory (
Initialize String Info Log data structures.
**/
VOID
-EFIAPI
InitSlide (
VOID
)
@@ -273,7 +267,6 @@ InitSlide (
**/
NODE
-EFIAPI
Child (
IN NODE LoopVar6,
IN UINT8 LoopVar5
@@ -298,7 +291,6 @@ Child (
@param[in] LoopVar4 The child node.
**/
VOID
-EFIAPI
MakeChild (
IN NODE LoopVar6,
IN UINT8 LoopVar5,
@@ -325,7 +317,6 @@ MakeChild (
@param[in] Old The node to split.
**/
VOID
-EFIAPI
Split (
IN NODE Old
)
@@ -355,7 +346,6 @@ Split (
**/
VOID
-EFIAPI
InsertNode (
VOID
)
@@ -484,7 +474,6 @@ InsertNode (
**/
VOID
-EFIAPI
DeleteNode (
VOID
)
@@ -579,7 +568,6 @@ DeleteNode (
@return The number of bytes actually read.
**/
INT32
-EFIAPI
FreadCrc (
OUT UINT8 *LoopVar7,
IN INT32 LoopVar8
@@ -612,7 +600,6 @@ FreadCrc (
@retval FALSE The operation failed due to insufficient memory.
**/
BOOLEAN
-EFIAPI
GetNextMatch (
VOID
)
@@ -647,7 +634,6 @@ GetNextMatch (
@param[in] LoopVar1 The index of the item to move.
**/
VOID
-EFIAPI
DownHeap (
IN INT32 i
)
@@ -684,7 +670,6 @@ DownHeap (
@param[in] LoopVar1 The top node.
**/
VOID
-EFIAPI
CountLen (
IN INT32 LoopVar1
)
@@ -705,7 +690,6 @@ CountLen (
@param[in] Root The root of the tree.
**/
VOID
-EFIAPI
MakeLen (
IN INT32 Root
)
@@ -761,7 +745,6 @@ MakeLen (
@param[out] Code The stores codes for each symbol.
**/
VOID
-EFIAPI
MakeCode (
IN INT32 LoopVar8,
IN UINT8 Len[ ],
@@ -792,7 +775,6 @@ MakeCode (
@return The root of the Huffman tree.
**/
INT32
-EFIAPI
MakeTree (
IN INT32 NParm,
IN UINT16 FreqParm[ ],
@@ -876,7 +858,6 @@ MakeTree (
@param[in] x The data.
**/
VOID
-EFIAPI
PutBits (
IN INT32 LoopVar8,
IN UINT32 x
@@ -915,7 +896,6 @@ PutBits (
@param[in] LoopVar5 The number to encode.
**/
VOID
-EFIAPI
EncodeC (
IN INT32 LoopVar5
)
@@ -929,7 +909,6 @@ EncodeC (
@param[in] LoopVar7 The number to encode.
**/
VOID
-EFIAPI
EncodeP (
IN UINT32 LoopVar7
)
@@ -956,7 +935,6 @@ EncodeP (
**/
VOID
-EFIAPI
CountTFreq (
VOID
)
@@ -1014,7 +992,6 @@ CountTFreq (
**/
VOID
-EFIAPI
WritePTLen (
IN INT32 LoopVar8,
IN INT32 nbit,
@@ -1053,7 +1030,6 @@ WritePTLen (
Outputs the code length array for Char&Length Set.
**/
VOID
-EFIAPI
WriteCLen (
VOID
)
@@ -1109,7 +1085,6 @@ WriteCLen (
**/
VOID
-EFIAPI
SendBlock (
VOID
)
@@ -1183,7 +1158,6 @@ SendBlock (
**/
VOID
-EFIAPI
HufEncodeStart (
VOID
)
@@ -1205,7 +1179,6 @@ HufEncodeStart (
@param[in] LoopVar7 The 'Position' field of a Pointer.
**/
VOID
-EFIAPI
CompressOutput (
IN UINT32 LoopVar5,
IN UINT32 LoopVar7
@@ -1243,7 +1216,6 @@ CompressOutput (
**/
VOID
-EFIAPI
HufEncodeEnd (
VOID
)
@@ -1263,7 +1235,6 @@ HufEncodeEnd (
@retval EFI_OUT_0F_RESOURCES Not enough memory for compression process.
**/
EFI_STATUS
-EFIAPI
Encode (
VOID
)
@@ -1346,7 +1317,6 @@ Encode (
@retval EFI_BUFFER_TOO_SMALL The buffer was too small. DstSize is required.
**/
EFI_STATUS
-EFIAPI
Compress (
IN VOID *SrcBuffer,
IN UINT64 SrcSize,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
index a1fe9d7..32e5917 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
@@ -26,7 +26,6 @@
@retval SHELL_SUCCESS The display was successful.
**/
SHELL_STATUS
-EFIAPI
DisplayTheBlocks(
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath,
IN CONST UINT64 Lba,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
index 5491f6d..42efb4c 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
@@ -31,7 +31,6 @@
@return A printable character representing Char.
**/
CHAR16
-EFIAPI
MakePrintable(
IN CONST CHAR16 Char
)
@@ -49,7 +48,6 @@ MakePrintable(
@param[in] Size The length of memory to display.
**/
SHELL_STATUS
-EFIAPI
DisplayMmioMemory(
IN CONST VOID *Address,
IN CONST UINTN Size
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index ac6d0bd..3427c99 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -42,7 +42,6 @@ typedef struct {
@retval The attribute string info.
**/
CHAR16 *
-EFIAPI
GetAttrType (
IN CONST UINT32 Atts
)
@@ -367,7 +366,6 @@ AppendSingleVariableToFile (
@retval SHELL_NOT_FOUND the Name/Guid pair could not be found.
**/
SHELL_STATUS
-EFIAPI
CascadeProcessVariables (
IN CONST CHAR16 *Name OPTIONAL,
IN CONST EFI_GUID *Guid OPTIONAL,
@@ -537,7 +535,6 @@ CascadeProcessVariables (
@retval SHELL_NOT_FOUND the Name/Guid pair could not be found.
**/
SHELL_STATUS
-EFIAPI
ProcessVariables (
IN CONST CHAR16 *Name OPTIONAL,
IN CONST EFI_GUID *Guid OPTIONAL,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
index efe0df0..9713cca 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
@@ -72,7 +72,6 @@ extern BOOLEAN EditorMouseAction;
@param EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferInit (
VOID
)
@@ -121,7 +120,6 @@ FileBufferInit (
@retval EFI_SUCCESS The backup operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferBackup (
VOID
)
@@ -155,7 +153,6 @@ FileBufferBackup (
@return The line structure after the advance.
**/
EFI_EDITOR_LINE *
-EFIAPI
InternalEditorMiscLineAdvance (
IN CONST UINTN Count,
IN CONST EFI_EDITOR_LINE *CurrentLine,
@@ -195,7 +192,6 @@ InternalEditorMiscLineAdvance (
@return The line structure after the retreat.
**/
EFI_EDITOR_LINE *
-EFIAPI
InternalEditorMiscLineRetreat (
IN CONST UINTN Count,
IN CONST EFI_EDITOR_LINE *CurrentLine,
@@ -262,7 +258,6 @@ MoveLine (
@retval EFI_SUCCESS The backup operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferRestoreMousePosition (
VOID
)
@@ -406,7 +401,6 @@ FileBufferRestoreMousePosition (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferFreeLines (
VOID
)
@@ -450,7 +444,6 @@ FileBufferFreeLines (
@retval EFI_SUCCESS The cleanup was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferCleanup (
VOID
)
@@ -537,7 +530,6 @@ FileBufferPrintLine (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferRestorePosition (
VOID
)
@@ -559,7 +551,6 @@ FileBufferRestorePosition (
@retval EFI_LOAD_ERROR There was an error finding what to write.
**/
EFI_STATUS
-EFIAPI
FileBufferRefresh (
VOID
)
@@ -671,7 +662,6 @@ FileBufferRefresh (
@return The line created.
**/
EFI_EDITOR_LINE *
-EFIAPI
FileBufferCreateLine (
VOID
)
@@ -726,7 +716,6 @@ FileBufferCreateLine (
@retval EFI_INVALID_PARAMETER Str is not a valid filename.
**/
EFI_STATUS
-EFIAPI
FileBufferSetFileName (
IN CONST CHAR16 *Str
)
@@ -758,7 +747,6 @@ FileBufferSetFileName (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferFree (
VOID
)
@@ -785,7 +773,6 @@ FileBufferFree (
@retval EFI_INVALID_PARAMETER FileName is a directory.
**/
EFI_STATUS
-EFIAPI
FileBufferRead (
IN CONST CHAR16 *FileName,
IN CONST BOOLEAN Recover
@@ -1280,7 +1267,6 @@ Done:
@param[out] Size The amount of the buffer used on return.
**/
VOID
-EFIAPI
GetNewLine (
IN CONST EE_NEWLINE_TYPE Type,
OUT CHAR8 *Buffer,
@@ -1387,7 +1373,6 @@ GetNewLine (
@return The actuall length.
**/
UINTN
-EFIAPI
UnicodeToAscii (
IN CONST CHAR16 *UStr,
IN CONST UINTN Length,
@@ -1416,7 +1401,6 @@ UnicodeToAscii (
@retval EFI_OUT_OF_RESOURCES There were not enough resources to write the file.
**/
EFI_STATUS
-EFIAPI
FileBufferSave (
IN CONST CHAR16 *FileName
)
@@ -1656,7 +1640,6 @@ FileBufferSave (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferScrollLeft (
VOID
)
@@ -1703,7 +1686,6 @@ FileBufferScrollLeft (
@param[in] Pos Position to delete the char at ( start from 0 ).
**/
VOID
-EFIAPI
LineDeleteAt (
IN OUT EFI_EDITOR_LINE *Line,
IN UINTN Pos
@@ -1728,7 +1710,6 @@ LineDeleteAt (
@param[in] Src Src String.
**/
VOID
-EFIAPI
LineCat (
IN OUT EFI_EDITOR_LINE *Dest,
IN EFI_EDITOR_LINE *Src
@@ -1769,7 +1750,6 @@ LineCat (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferDoBackspace (
VOID
)
@@ -1841,7 +1821,6 @@ FileBufferDoBackspace (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferDoReturn (
VOID
)
@@ -1938,7 +1917,6 @@ FileBufferDoReturn (
@retval EFI_SUCCESS
**/
EFI_STATUS
-EFIAPI
FileBufferDoDelete (
VOID
)
@@ -2001,7 +1979,6 @@ FileBufferDoDelete (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferScrollRight (
VOID
)
@@ -2055,7 +2032,6 @@ FileBufferScrollRight (
@return The new string size ( include CHAR_NULL ) ( unit is Unicode character ).
**/
UINTN
-EFIAPI
LineStrInsert (
IN EFI_EDITOR_LINE *Line,
IN CHAR16 Char,
@@ -2108,7 +2084,6 @@ LineStrInsert (
@retval EFI_SUCCESS The input was succesful.
**/
EFI_STATUS
-EFIAPI
FileBufferAddChar (
IN CHAR16 Char
)
@@ -2156,7 +2131,6 @@ FileBufferAddChar (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferDoCharInput (
IN CONST CHAR16 Char
)
@@ -2207,7 +2181,6 @@ FileBufferDoCharInput (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferScrollDown (
VOID
)
@@ -2253,7 +2226,6 @@ FileBufferScrollDown (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferScrollUp (
VOID
)
@@ -2296,7 +2268,6 @@ FileBufferScrollUp (
@retval EFI_SUCCESS The operation wa successful.
**/
EFI_STATUS
-EFIAPI
FileBufferPageDown (
VOID
)
@@ -2347,7 +2318,6 @@ FileBufferPageDown (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferPageUp (
VOID
)
@@ -2403,7 +2373,6 @@ FileBufferPageUp (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferEnd (
VOID
)
@@ -2441,7 +2410,6 @@ FileBufferEnd (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferHandleInput (
IN CONST EFI_INPUT_KEY *Key
)
@@ -2557,7 +2525,6 @@ FileBufferHandleInput (
@retval FALSE It is not above the current screen.
**/
BOOLEAN
-EFIAPI
AboveCurrentScreen (
IN UINTN FileRow
)
@@ -2581,7 +2548,6 @@ AboveCurrentScreen (
@retval FALSE It is not under the current screen.
**/
BOOLEAN
-EFIAPI
UnderCurrentScreen (
IN UINTN FileRow
)
@@ -2605,7 +2571,6 @@ UnderCurrentScreen (
@retval FALSE It is not to the left.
**/
BOOLEAN
-EFIAPI
LeftCurrentScreen (
IN UINTN FileCol
)
@@ -2629,7 +2594,6 @@ LeftCurrentScreen (
@retval FALSE It is not to the right.
**/
BOOLEAN
-EFIAPI
RightCurrentScreen (
IN UINTN FileCol
)
@@ -2655,7 +2619,6 @@ RightCurrentScreen (
@return The line after advance/retreat.
**/
EFI_EDITOR_LINE *
-EFIAPI
MoveCurrentLine (
IN INTN Count
)
@@ -2686,7 +2649,6 @@ MoveCurrentLine (
@param[in] NewFilePosCol The column of file position ( start from 1 ).
**/
VOID
-EFIAPI
FileBufferMovePosition (
IN CONST UINTN NewFilePosRow,
IN CONST UINTN NewFilePosCol
@@ -2802,7 +2764,6 @@ FileBufferMovePosition (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferCutLine (
OUT EFI_EDITOR_LINE **CutLine
)
@@ -2882,7 +2843,6 @@ FileBufferCutLine (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferPasteLine (
VOID
)
@@ -2954,7 +2914,6 @@ FileBufferPasteLine (
@retval EFI_NOT_FOUND The string Str was not found.
**/
EFI_STATUS
-EFIAPI
FileBufferSearch (
IN CONST CHAR16 *Str,
IN CONST UINTN Offset
@@ -3060,7 +3019,6 @@ FileBufferSearch (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferReplace (
IN CONST CHAR16 *Replace,
IN CONST UINTN SearchLen
@@ -3165,7 +3123,6 @@ FileBufferReplace (
@param[in] TextY The new y-coordinate.
**/
VOID
-EFIAPI
FileBufferAdjustMousePosition (
IN CONST INT32 TextX,
IN CONST INT32 TextY
@@ -3242,7 +3199,6 @@ FileBufferAdjustMousePosition (
@param[in] Offset The column to start at.
**/
EFI_STATUS
-EFIAPI
FileBufferReplaceAll (
IN CHAR16 *SearchStr,
IN CHAR16 *ReplaceStr,
@@ -3360,7 +3316,6 @@ FileBufferReplaceAll (
Set the modified state to TRUE.
**/
VOID
-EFIAPI
FileBufferSetModified (
VOID
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.h
index 9d4a08d..6b46e4a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.h
@@ -25,7 +25,6 @@
@param EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferInit (
VOID
);
@@ -36,7 +35,6 @@ FileBufferInit (
@retval EFI_SUCCESS The cleanup was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferCleanup (
VOID
);
@@ -48,7 +46,6 @@ FileBufferCleanup (
@retval EFI_LOAD_ERROR There was an error finding what to write.
**/
EFI_STATUS
-EFIAPI
FileBufferRefresh (
VOID
);
@@ -68,7 +65,6 @@ FileBufferRefresh (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferHandleInput (
IN CONST EFI_INPUT_KEY * Key
);
@@ -84,7 +80,6 @@ FileBufferHandleInput (
@retval EFI_SUCCESS The backup operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferBackup (
VOID
);
@@ -95,7 +90,6 @@ FileBufferBackup (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
FileBufferRestorePosition (
VOID
);
@@ -110,7 +104,6 @@ FileBufferRestorePosition (
@retval EFI_INVALID_PARAMETER Str is not a valid filename.
**/
EFI_STATUS
-EFIAPI
FileBufferSetFileName (
IN CONST CHAR16 *Str
);
@@ -127,7 +120,6 @@ FileBufferSetFileName (
@retval EFI_INVALID_PARAMETER FileName is a directory.
**/
EFI_STATUS
-EFIAPI
FileBufferRead (
IN CONST CHAR16 *FileName,
IN CONST BOOLEAN Recover
@@ -143,7 +135,6 @@ FileBufferRead (
@retval EFI_OUT_OF_RESOURCES There were not enough resources to write the file.
**/
EFI_STATUS
-EFIAPI
FileBufferSave (
CONST CHAR16 *FileName
);
@@ -155,7 +146,6 @@ FileBufferSave (
@param[in] NewFilePosCol The column of file position ( start from 1 ).
**/
VOID
-EFIAPI
FileBufferMovePosition (
IN CONST UINTN NewFilePosRow,
IN CONST UINTN NewFilePosCol
@@ -172,7 +162,6 @@ FileBufferMovePosition (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferCutLine (
OUT EFI_EDITOR_LINE **CutLine
);
@@ -184,7 +173,6 @@ FileBufferCutLine (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferPasteLine (
VOID
);
@@ -199,7 +187,6 @@ FileBufferPasteLine (
@retval EFI_NOT_FOUND The string Str was not found.
**/
EFI_STATUS
-EFIAPI
FileBufferSearch (
IN CONST CHAR16 *Str,
IN CONST UINTN Offset
@@ -217,7 +204,6 @@ FileBufferSearch (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
FileBufferReplace (
IN CONST CHAR16 *Replace,
IN CONST UINTN SearchLen
@@ -231,7 +217,6 @@ FileBufferReplace (
@param[in] Offset The column to start at.
**/
EFI_STATUS
-EFIAPI
FileBufferReplaceAll (
IN CHAR16 *SearchStr,
IN CHAR16 *ReplaceStr,
@@ -245,7 +230,6 @@ FileBufferReplaceAll (
@param[in] TextY The new y-coordinate.
**/
VOID
-EFIAPI
FileBufferAdjustMousePosition (
IN CONST INT32 TextX,
IN CONST INT32 TextY
@@ -255,7 +239,6 @@ FileBufferAdjustMousePosition (
Set the modified state to TRUE.
**/
VOID
-EFIAPI
FileBufferSetModified (
VOID
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
index 4eb7d9e..14f51df 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
@@ -1418,7 +1418,6 @@ EFI_EDITOR_GLOBAL_EDITOR MainEditorConst = {
@retval EFI_LOAD_ERROR A load error occured.
**/
EFI_STATUS
-EFIAPI
MainEditorInit (
VOID
)
@@ -1552,7 +1551,6 @@ MainEditorInit (
@retval EFI_LOAD_ERROR A load error occured.
**/
EFI_STATUS
-EFIAPI
MainEditorCleanup (
VOID
)
@@ -1596,7 +1594,6 @@ MainEditorCleanup (
Refresh the main editor component.
**/
VOID
-EFIAPI
MainEditorRefresh (
VOID
)
@@ -1649,7 +1646,6 @@ MainEditorRefresh (
@return The X location of the mouse.
**/
INT32
-EFIAPI
GetTextX (
IN INT32 GuidX
)
@@ -1671,7 +1667,6 @@ GetTextX (
@return The Y location of the mouse.
**/
INT32
-EFIAPI
GetTextY (
IN INT32 GuidY
)
@@ -1695,7 +1690,6 @@ GetTextY (
@retval EFI_NOT_FOUND There was no mouse support found.
**/
EFI_STATUS
-EFIAPI
MainEditorHandleMouseInput (
IN EFI_SIMPLE_POINTER_STATE MouseState
)
@@ -1796,7 +1790,6 @@ MainEditorHandleMouseInput (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MainEditorKeyInput (
VOID
)
@@ -1893,7 +1886,6 @@ MainEditorKeyInput (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MainEditorSetCutLine (
EFI_EDITOR_LINE *Line
)
@@ -1925,7 +1917,6 @@ MainEditorSetCutLine (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
MainEditorBackup (
VOID
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
index c45859d..8d9b9a9 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
@@ -24,7 +24,6 @@
@retval EFI_LOAD_ERROR A load error occured.
**/
EFI_STATUS
-EFIAPI
MainEditorInit (
VOID
);
@@ -36,7 +35,6 @@ MainEditorInit (
@retval EFI_LOAD_ERROR A load error occured.
**/
EFI_STATUS
-EFIAPI
MainEditorCleanup (
VOID
);
@@ -45,7 +43,6 @@ MainEditorCleanup (
Refresh the main editor component.
**/
VOID
-EFIAPI
MainEditorRefresh (
VOID
);
@@ -58,7 +55,6 @@ MainEditorRefresh (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MainEditorKeyInput (
VOID
);
@@ -69,7 +65,6 @@ MainEditorKeyInput (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
MainEditorBackup (
VOID
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.c
index ade78b8..e925e4e 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.c
@@ -24,7 +24,6 @@
@return a pointer to the newly allcoated line.
**/
EFI_EDITOR_LINE *
-EFIAPI
LineDup (
IN EFI_EDITOR_LINE *Src
)
@@ -65,7 +64,6 @@ LineDup (
@param Src The line structure to free.
**/
VOID
-EFIAPI
LineFree (
IN EFI_EDITOR_LINE *Src
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.h
index 583de3b..fa0f3ba 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/Misc.h
@@ -25,7 +25,6 @@
@param Src The line structure to free.
**/
VOID
-EFIAPI
LineFree (
IN EFI_EDITOR_LINE *Src
);
@@ -39,7 +38,6 @@ LineFree (
@return a pointer to the newly allcoated line.
**/
EFI_EDITOR_LINE *
-EFIAPI
LineDup (
IN EFI_EDITOR_LINE *Src
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
index 5c43ffc..26f70d7 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
@@ -23,7 +23,6 @@ UINTN StringSize; // Size of mReturnString space size.
Initialize the input bar.
**/
VOID
-EFIAPI
InputBarInit (
VOID
)
@@ -37,7 +36,6 @@ InputBarInit (
Cleanup function for input bar.
**/
VOID
-EFIAPI
InputBarCleanup (
VOID
)
@@ -59,7 +57,6 @@ InputBarCleanup (
@param[in] LastRow The last printable row.
**/
VOID
-EFIAPI
InputBarPrintInput (
IN UINTN LastColumn,
IN UINTN LastRow
@@ -121,7 +118,6 @@ typedef union {
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
InputBarRefresh (
UINTN LastRow,
UINTN LastColumn
@@ -261,7 +257,6 @@ InputBarRefresh (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
InputBarSetPrompt (
IN CONST CHAR16 *Str
)
@@ -288,7 +283,6 @@ InputBarSetPrompt (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
InputBarSetStringSize (
UINTN Size
)
@@ -314,7 +308,6 @@ InputBarSetStringSize (
@return The string that was input.
**/
CONST CHAR16*
-EFIAPI
InputBarGetString (
VOID
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.h
index c8557a8..f4aaee9 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.h
@@ -19,7 +19,6 @@
Initialize the input bar.
**/
VOID
-EFIAPI
InputBarInit (
VOID
);
@@ -28,7 +27,6 @@ InputBarInit (
Cleanup function for input bar.
**/
VOID
-EFIAPI
InputBarCleanup (
VOID
);
@@ -42,7 +40,6 @@ InputBarCleanup (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
InputBarRefresh (
UINTN LastRow,
UINTN LastColumn
@@ -57,7 +54,6 @@ InputBarRefresh (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
InputBarSetPrompt (
IN CONST CHAR16 *Str
);
@@ -71,7 +67,6 @@ InputBarSetPrompt (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
InputBarSetStringSize (
UINTN Size
);
@@ -83,7 +78,6 @@ InputBarSetStringSize (
@return The string that was input.
**/
CONST CHAR16*
-EFIAPI
InputBarGetString (
VOID
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c
index b721850..2e00b90 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c
@@ -24,7 +24,6 @@ UINTN NumItems;
Cleanup function for a menu bar. frees all allocated memory.
**/
VOID
-EFIAPI
MenuBarCleanup (
VOID
)
@@ -41,7 +40,6 @@ MenuBarCleanup (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MenuBarInit (
IN CONST EDITOR_MENU_ITEM *Items
)
@@ -66,7 +64,6 @@ MenuBarInit (
@retval EFI_SUCCESS The initialization was correct.
**/
EFI_STATUS
-EFIAPI
ControlHotKeyInit (
IN MENU_ITEM_FUNCTION *Items
)
@@ -83,7 +80,6 @@ ControlHotKeyInit (
@retval EFI_SUCCESS The refresh was successful.
**/
EFI_STATUS
-EFIAPI
MenuBarRefresh (
IN CONST UINTN LastRow,
IN CONST UINTN LastCol
@@ -147,7 +143,6 @@ MenuBarRefresh (
@return The return value from the called dispatch function.
**/
EFI_STATUS
-EFIAPI
MenuBarDispatchFunctionKey (
IN CONST EFI_INPUT_KEY *Key
)
@@ -177,7 +172,6 @@ MenuBarDispatchFunctionKey (
@return EFI_SUCCESS.
**/
EFI_STATUS
-EFIAPI
MenuBarDispatchControlHotKey (
IN CONST EFI_INPUT_KEY *Key
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.h
index 8cd846f..d545db9 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.h
@@ -50,7 +50,6 @@ typedef struct _EDITOR_MENU_ITEM {
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MenuBarInit (
IN CONST EDITOR_MENU_ITEM *Items
);
@@ -63,7 +62,6 @@ MenuBarInit (
@retval EFI_SUCCESS The initialization was correct.
**/
EFI_STATUS
-EFIAPI
ControlHotKeyInit (
IN MENU_ITEM_FUNCTION *Items
);
@@ -72,7 +70,6 @@ ControlHotKeyInit (
Cleanup function for a menu bar. frees all allocated memory.
**/
VOID
-EFIAPI
MenuBarCleanup (
VOID
);
@@ -86,7 +83,6 @@ MenuBarCleanup (
@retval EFI_SUCCESS The refresh was successful.
**/
EFI_STATUS
-EFIAPI
MenuBarRefresh (
IN CONST UINTN LastRow,
IN CONST UINTN LastCol
@@ -102,7 +98,6 @@ MenuBarRefresh (
@return The return value from the called dispatch function.
**/
EFI_STATUS
-EFIAPI
MenuBarDispatchFunctionKey (
IN CONST EFI_INPUT_KEY *Key
);
@@ -117,7 +112,6 @@ MenuBarDispatchFunctionKey (
@return EFI_SUCCESS.
**/
EFI_STATUS
-EFIAPI
MenuBarDispatchControlHotKey (
IN CONST EFI_INPUT_KEY *Key
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
index fbf48b7..e7792c1 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
@@ -27,7 +27,6 @@ BOOLEAN StatusStringChanged;
@sa StatusBarSetStatusString
**/
EFI_STATUS
-EFIAPI
StatusBarInit (
VOID
)
@@ -49,7 +48,6 @@ StatusBarInit (
Cleanup function for the status bar.
**/
VOID
-EFIAPI
StatusBarCleanup (
VOID
)
@@ -84,7 +82,6 @@ typedef union {
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
StatusBarRefresh (
IN BOOLEAN EditorFirst,
IN UINTN LastRow,
@@ -177,7 +174,6 @@ StatusBarRefresh (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
StatusBarSetStatusString (
IN CHAR16 *Str
)
@@ -202,7 +198,6 @@ StatusBarSetStatusString (
@return The string that is used.
**/
CONST CHAR16*
-EFIAPI
StatusBarGetString (
VOID
)
@@ -214,7 +209,6 @@ StatusBarGetString (
Function to set the need refresh boolean to TRUE.
**/
VOID
-EFIAPI
StatusBarSetRefresh(
VOID
)
@@ -228,7 +222,6 @@ StatusBarSetRefresh(
@retval TRUE The status bar needs to be refreshed.
**/
BOOLEAN
-EFIAPI
StatusBarGetRefresh(
VOID
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.h
index debf83a..61d19cc 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.h
@@ -23,7 +23,6 @@
@sa StatusBarSetStatusString
**/
EFI_STATUS
-EFIAPI
StatusBarInit (
VOID
);
@@ -32,7 +31,6 @@ StatusBarInit (
Cleanup function for the status bar.
**/
VOID
-EFIAPI
StatusBarCleanup (
VOID
);
@@ -51,7 +49,6 @@ StatusBarCleanup (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
StatusBarRefresh (
IN BOOLEAN EditorFirst,
IN UINTN LastRow,
@@ -70,7 +67,6 @@ StatusBarRefresh (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
StatusBarSetStatusString (
IN CHAR16 *Str
);
@@ -81,7 +77,6 @@ StatusBarSetStatusString (
@return The string that is used.
**/
CONST CHAR16*
-EFIAPI
StatusBarGetString (
VOID
);
@@ -90,7 +85,6 @@ StatusBarGetString (
Function to set the need refresh boolean to TRUE.
**/
VOID
-EFIAPI
StatusBarSetRefresh(
VOID
);
@@ -101,7 +95,6 @@ StatusBarSetRefresh(
@retval TRUE The status bar needs to be refreshed.
**/
BOOLEAN
-EFIAPI
StatusBarGetRefresh(
VOID
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
index a0d7cad..727605c 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
@@ -27,7 +27,6 @@ CHAR16 *Title = NULL;
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MainTitleBarInit (
CONST CHAR16 *Prompt
)
@@ -52,7 +51,6 @@ MainTitleBarInit (
Clean up the memory used.
**/
VOID
-EFIAPI
MainTitleBarCleanup (
VOID
)
@@ -86,7 +84,6 @@ typedef union {
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
MainTitleBarRefresh (
IN CONST CHAR16 *FileName OPTIONAL,
IN CONST EDIT_FILE_TYPE FileType,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.h
index d8f420f..a416a3b 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.h
@@ -24,7 +24,6 @@
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MainTitleBarInit (
CONST CHAR16 *Prompt
);
@@ -33,7 +32,6 @@ MainTitleBarInit (
Clean up the memory used.
**/
VOID
-EFIAPI
MainTitleBarCleanup (
VOID
);
@@ -62,7 +60,6 @@ typedef enum {
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
MainTitleBarRefresh (
IN CONST CHAR16 *FileName OPTIONAL,
IN CONST EDIT_FILE_TYPE FileType,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index 777c2e0..68d2443 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -906,7 +906,6 @@ HBufferImageRefresh (
@return EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
HBufferImageRead (
IN CONST CHAR16 *FileName,
IN CONST CHAR16 *DiskName,
@@ -1101,7 +1100,6 @@ HBufferImageFree (
@retval -1 The operation failed.
**/
INTN
-EFIAPI
HBufferImageCharToHex (
IN CHAR16 Char
)
@@ -1133,7 +1131,6 @@ HBufferImageCharToHex (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
HBufferImageAddChar (
IN CHAR16 Char
)
@@ -1264,7 +1261,6 @@ HBufferImageAddChar (
@retval EFI_SUCCESS The operationw as successful.
**/
EFI_STATUS
-EFIAPI
HBufferImageDoBackspace (
VOID
)
@@ -1328,7 +1324,6 @@ HBufferImageDoBackspace (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
HBufferImageDoCharInput (
IN CHAR16 Char
)
@@ -2119,7 +2114,6 @@ HBufferImageAddCharacterToBuffer (
@retval EFI_SUCCESS The operationw as successful.
**/
EFI_STATUS
-EFIAPI
HBufferImageDoDelete (
VOID
)
@@ -2180,7 +2174,6 @@ HBufferImageDoDelete (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
HBufferImageBufferToList (
IN VOID *Buffer,
IN UINTN Bytes
@@ -2245,7 +2238,6 @@ HBufferImageBufferToList (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
HBufferImageListToBuffer (
IN VOID *Buffer,
IN UINTN Bytes
@@ -2300,7 +2292,6 @@ HBufferImageListToBuffer (
@param[in] TextY The y-coordinate.
**/
VOID
-EFIAPI
HBufferImageAdjustMousePosition (
IN INT32 TextX,
IN INT32 TextY
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
index 91369b5..04deada 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
@@ -97,7 +97,6 @@ HBufferImageBackup (
@return EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
HBufferImageRead (
IN CONST CHAR16 *FileName,
IN CONST CHAR16 *DiskName,
@@ -215,7 +214,6 @@ HBufferImageAddCharacterToBuffer (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
HBufferImageBufferToList (
IN VOID *Buffer,
IN UINTN Bytes
@@ -230,7 +228,6 @@ HBufferImageBufferToList (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
HBufferImageListToBuffer (
IN VOID *Buffer,
IN UINTN Bytes
@@ -243,7 +240,6 @@ HBufferImageListToBuffer (
@param[in] TextY The y-coordinate.
**/
VOID
-EFIAPI
HBufferImageAdjustMousePosition (
IN INT32 TextX,
IN INT32 TextY
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
index a50b52f..289d9b6 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
@@ -114,7 +114,6 @@ HDiskImageCleanup (
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
HDiskImageSetDiskNameOffsetSize (
IN CONST CHAR16 *Str,
IN UINTN Offset,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index 4c346cc..491acb1 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -2307,7 +2307,6 @@ HMainEditorKeyInput (
Backup function for MainEditor.
**/
VOID
-EFIAPI
HMainEditorBackup (
VOID
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
index ad9a7b4..0c2ffe9 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
@@ -68,7 +68,6 @@ HMainEditorKeyInput (
Backup function for MainEditor.
**/
VOID
-EFIAPI
HMainEditorBackup (
VOID
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c
index c9078f7..7be658d 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c
@@ -44,7 +44,6 @@ LoadPciRomConnectAllDriversToAllControllers (
@retval Other value Unknown error.
**/
EFI_STATUS
-EFIAPI
LoadEfiDriversFromRomImage (
VOID *RomBar,
UINTN RomSize,
@@ -198,7 +197,6 @@ ShellCommandRunLoadPciRom (
@retval Other value Unknown error.
**/
EFI_STATUS
-EFIAPI
LoadEfiDriversFromRomImage (
VOID *RomBar,
UINTN RomSize,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
index 26a758b..6caf448 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
@@ -69,7 +69,6 @@ CONST EFI_CPU_IO_PROTOCOL_WIDTH mShellMmCpuIoWidth[] = {
@param[out] Register PCI register offset.
**/
VOID
-EFIAPI
ShellMmDecodePciAddress (
IN BOOLEAN PciFormat,
IN UINT64 Address,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
index 664c22b..5302051 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
@@ -5032,7 +5032,6 @@ ExplainPcieRootStatus (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityLinkControl (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5065,7 +5064,6 @@ PrintInterpretedExtendedCompatibilityLinkControl (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityPowerBudgeting (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5098,7 +5096,6 @@ PrintInterpretedExtendedCompatibilityPowerBudgeting (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityAcs (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5149,7 +5146,6 @@ PrintInterpretedExtendedCompatibilityAcs (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityLatencyToleranceReporting (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5181,7 +5177,6 @@ PrintInterpretedExtendedCompatibilityLatencyToleranceReporting (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilitySerialNumber (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5212,7 +5207,6 @@ PrintInterpretedExtendedCompatibilitySerialNumber (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityRcrb (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5246,7 +5240,6 @@ PrintInterpretedExtendedCompatibilityRcrb (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityVendorSpecific (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5277,7 +5270,6 @@ PrintInterpretedExtendedCompatibilityVendorSpecific (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityECEA (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5308,7 +5300,6 @@ PrintInterpretedExtendedCompatibilityECEA (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityAri (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5340,7 +5331,6 @@ PrintInterpretedExtendedCompatibilityAri (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityDynamicPowerAllocation (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5384,7 +5374,6 @@ PrintInterpretedExtendedCompatibilityDynamicPowerAllocation (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityLinkDeclaration (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5426,7 +5415,6 @@ PrintInterpretedExtendedCompatibilityLinkDeclaration (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityAer (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5475,7 +5463,6 @@ PrintInterpretedExtendedCompatibilityAer (
@param[in] PciExpressCapPtr The address of the PCIe capabilities structure.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityMulticast (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress,
@@ -5515,7 +5502,6 @@ PrintInterpretedExtendedCompatibilityMulticast (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityVirtualChannel (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5568,7 +5554,6 @@ PrintInterpretedExtendedCompatibilityVirtualChannel (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityResizeableBar (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5606,7 +5591,6 @@ PrintInterpretedExtendedCompatibilityResizeableBar (
@param[in] HeadersBaseAddress The address of all the extended capability headers.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilityTph (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress
@@ -5647,7 +5631,6 @@ PrintInterpretedExtendedCompatibilityTph (
@param[in] PciExpressCapPtr The address of the PCIe capabilities structure.
**/
EFI_STATUS
-EFIAPI
PrintInterpretedExtendedCompatibilitySecondary (
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress,
@@ -5689,7 +5672,6 @@ PrintInterpretedExtendedCompatibilitySecondary (
@param[in] PciExpressCapPtr The address of the PCIe capabilities structure.
**/
EFI_STATUS
-EFIAPI
PrintPciExtendedCapabilityDetails(
IN CONST PCI_EXP_EXT_HDR *HeadersBaseAddress,
IN CONST PCI_EXP_EXT_HDR *HeaderAddress,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c
index d885677..fe612b8 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SerMode.c
@@ -29,7 +29,6 @@
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
DisplaySettings (
IN UINTN HandleIdx,
IN BOOLEAN HandleValid
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c
index bffe047..d98a346 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c
@@ -36,7 +36,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
empty.)
**/
BOOLEAN
-EFIAPI
IsStringOfHexNibbles (
IN CONST CHAR16 *String
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c
index f07a4c4..50ba048 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.c
@@ -24,7 +24,6 @@
@param[in] Option Whether to print the additional information.
**/
VOID
-EFIAPI
DisplaySELAccessMethod (
IN CONST UINT8 Key,
IN CONST UINT8 Option
@@ -76,7 +75,6 @@ DisplaySELAccessMethod (
@param[in] Option Whether to print the additional information.
**/
VOID
-EFIAPI
DisplaySELLogStatus (
UINT8 Key,
UINT8 Option
@@ -115,7 +113,6 @@ DisplaySELLogStatus (
@param[in] Option Whether to print the additional information.
**/
VOID
-EFIAPI
DisplaySysEventLogHeaderFormat (
UINT8 Key,
UINT8 Option
@@ -220,7 +217,6 @@ DisplaySysEventLogHeaderType1 (
@param[in] LogHeader Format informcation.
**/
VOID
-EFIAPI
DisplaySysEventLogHeader (
UINT8 LogHeaderFormat,
UINT8 *LogHeader
@@ -334,7 +330,6 @@ DisplayElVdfInfo (
@param[in] LogAreaLength Length of the data.
**/
VOID
-EFIAPI
DisplaySysEventLogData (
UINT8 *LogData,
UINT16 LogAreaLength
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.h
index b32cfea..7351431 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/EventLogInfo.h
@@ -56,7 +56,6 @@ typedef struct {
@param[in] Option Whether to print the additional information.
**/
VOID
-EFIAPI
DisplaySELAccessMethod (
IN CONST UINT8 Key,
IN CONST UINT8 Option
@@ -69,7 +68,6 @@ DisplaySELAccessMethod (
@param[in] Option Whether to print the additional information.
**/
VOID
-EFIAPI
DisplaySELLogStatus (
UINT8 Key,
UINT8 Option
@@ -82,7 +80,6 @@ DisplaySELLogStatus (
@param[in] Option Whether to print the additional information.
**/
VOID
-EFIAPI
DisplaySysEventLogHeaderFormat (
UINT8 Key,
UINT8 Option
@@ -95,7 +92,6 @@ DisplaySysEventLogHeaderFormat (
@param[in] LogHeader Format informcation.
**/
VOID
-EFIAPI
DisplaySysEventLogHeader (
UINT8 LogHeaderFormat,
UINT8 *LogHeader
@@ -108,7 +104,6 @@ DisplaySysEventLogHeader (
@param[in] LogAreaLength Length of the data.
**/
VOID
-EFIAPI
DisplaySysEventLogData (
UINT8 *LogData,
UINT16 LogAreaLength
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c
index a063394..56b682a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c
@@ -242,7 +242,6 @@ Done:
@retval EFI_BAD_BUFFER_SIZE structure is out of the range of SMBIOS table.
**/
EFI_STATUS
-EFIAPI
SMBiosView (
IN UINT8 QueryType,
IN UINT16 QueryHandle,
@@ -416,7 +415,6 @@ SMBiosView (
@retval EFI_BAD_BUFFER_SIZE structure is out of the range of SMBIOS table.
**/
EFI_STATUS
-EFIAPI
SMBios64View (
IN UINT8 QueryType,
IN UINT16 QueryHandle,
@@ -582,7 +580,6 @@ SMBios64View (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
InitSmbiosTableStatistics (
VOID
)
@@ -672,7 +669,6 @@ InitSmbiosTableStatistics (
@retval EFI_SUCCESS Calculation was successful.
**/
EFI_STATUS
-EFIAPI
CalculateSmbios64BitStructureCountAndLength (
SMBIOS_TABLE_3_0_ENTRY_POINT *Smbios64EntryPoint,
UINTN *NumberOfSmbios64Structures,
@@ -722,7 +718,6 @@ CalculateSmbios64BitStructureCountAndLength (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
InitSmbios64BitTableStatistics (
VOID
)
@@ -819,7 +814,6 @@ InitSmbios64BitTableStatistics (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
DisplayStatisticsTable (
IN UINT8 Option
)
@@ -900,7 +894,6 @@ DisplayStatisticsTable (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
DisplaySmbios64BitStatisticsTable (
IN UINT8 Option
)
@@ -981,7 +974,6 @@ DisplaySmbios64BitStatisticsTable (
@return A pointer to a string representing the ShowType (or 'undefined type' if not known).
**/
CHAR16 *
-EFIAPI
GetShowTypeString (
UINT8 ShowType
)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.h
index 647fd5f..d67af08 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.h
@@ -39,7 +39,6 @@ typedef struct {
@retval EFI_BAD_BUFFER_SIZE structure is out of the range of SMBIOS table.
**/
EFI_STATUS
-EFIAPI
SMBiosView (
IN UINT8 QueryType,
IN UINT16 QueryHandle,
@@ -60,7 +59,6 @@ SMBiosView (
@retval EFI_BAD_BUFFER_SIZE structure is out of the range of SMBIOS table.
**/
EFI_STATUS
-EFIAPI
SMBios64View (
IN UINT8 QueryType,
IN UINT16 QueryHandle,
@@ -74,7 +72,6 @@ SMBios64View (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
InitSmbiosTableStatistics (
VOID
);
@@ -85,7 +82,6 @@ InitSmbiosTableStatistics (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
InitSmbios64BitTableStatistics (
VOID
);
@@ -98,7 +94,6 @@ InitSmbios64BitTableStatistics (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
DisplayStatisticsTable (
IN UINT8 Option
);
@@ -111,7 +106,6 @@ DisplayStatisticsTable (
@retval EFI_SUCCESS print is successful.
**/
EFI_STATUS
-EFIAPI
DisplaySmbios64BitStatisticsTable (
IN UINT8 Option
);
@@ -124,7 +118,6 @@ DisplaySmbios64BitStatisticsTable (
@return A pointer to a string representing the ShowType (or 'undefined type' if not known).
**/
CHAR16*
-EFIAPI
GetShowTypeString (
UINT8 ShowType
);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 1814564..6ebf002 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -131,7 +131,6 @@ UefiShellDebug1CommandsLibDestructor (
//Stolen from MdePkg Baselib
**/
CHAR16
-EFIAPI
CharToUpper (
IN CHAR16 Char
)
@@ -154,7 +153,6 @@ CharToUpper (
@retval EFI_NOT_FOUND A configuration table matching TableGuid was not found.
**/
EFI_STATUS
-EFIAPI
GetSystemConfigurationTable (
IN EFI_GUID *TableGuid,
IN OUT VOID **Table
@@ -187,7 +185,6 @@ GetSystemConfigurationTable (
**/
UINTN
-EFIAPI
HexCharToUintn (
IN CHAR16 Char
)
@@ -209,7 +206,6 @@ HexCharToUintn (
@retval EFI_SUCCESS The conversion was successful.
**/
EFI_STATUS
-EFIAPI
ConvertStringToGuid (
IN CONST CHAR16 *StringGuid,
IN OUT EFI_GUID *Guid
@@ -300,7 +296,6 @@ ConvertStringToGuid (
@param[in] LastRow The last printable row.
**/
VOID
-EFIAPI
EditorClearLine (
IN UINTN Row,
IN UINTN LastCol,
@@ -342,7 +337,6 @@ EditorClearLine (
@retval FALSE The character is not valid.
**/
BOOLEAN
-EFIAPI
IsValidFileNameChar (
IN CONST CHAR16 Ch
)
@@ -366,7 +360,6 @@ IsValidFileNameChar (
@retval FALSE The filename is not ok.
**/
BOOLEAN
-EFIAPI
IsValidFileName (
IN CONST CHAR16 *Name
)
@@ -408,7 +401,6 @@ IsValidFileName (
@return the valid filename.
**/
CHAR16 *
-EFIAPI
EditGetDefaultFileName (
IN CONST CHAR16 *Extension
)
@@ -462,7 +454,6 @@ EditGetDefaultFileName (
@retval EFI_INVALID_PARAMETER FileName was a directory.
**/
EFI_STATUS
-EFIAPI
ReadFileIntoBuffer (
IN CONST CHAR16 *FileName,
OUT VOID **Buffer,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
index 6e018a6..4a4932e 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
@@ -72,7 +72,6 @@ extern EFI_HANDLE gShellDebug1HiiHandle;
@retval EFI_NOT_FOUND A configuration table matching TableGuid was not found.
**/
EFI_STATUS
-EFIAPI
GetSystemConfigurationTable (
IN EFI_GUID *TableGuid,
IN OUT VOID **Table
@@ -85,7 +84,6 @@ GetSystemConfigurationTable (
@param[in, out] Guid The pointer to the buffer to get the GUID value.
**/
EFI_STATUS
-EFIAPI
ConvertStringToGuid (
IN CONST CHAR16 *StringGuid,
IN OUT EFI_GUID *Guid
@@ -105,7 +103,6 @@ ConvertStringToGuid (
**/
UINTN
-EFIAPI
HexCharToUintn (
IN CHAR16 Char
);
@@ -352,7 +349,6 @@ ShellCommandRunHexEdit (
@param[in] LastRow The last printable row.
**/
VOID
-EFIAPI
EditorClearLine (
IN UINTN Row,
IN UINTN LastCol,
@@ -368,7 +364,6 @@ EditorClearLine (
@retval FALSE The filename is not ok.
**/
BOOLEAN
-EFIAPI
IsValidFileName (
IN CONST CHAR16 *Name
);
@@ -382,7 +377,6 @@ IsValidFileName (
@return the valid filename.
**/
CHAR16 *
-EFIAPI
EditGetDefaultFileName (
IN CONST CHAR16 *Extension
);
@@ -410,7 +404,6 @@ EditGetDefaultFileName (
@retval EFI_INVALID_PARAMETER FileName was a directory.
**/
EFI_STATUS
-EFIAPI
ReadFileIntoBuffer (
IN CONST CHAR16 *FileName,
OUT VOID **Buffer,
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 03/11] ShellPkg/UefiShellDriver1CommandsLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
2016-09-30 8:17 ` [PATCH 01/11] ShellPkg/Shell: " Ruiyu Ni
2016-09-30 8:17 ` [PATCH 02/11] ShellPkg/UefiShellDebug1CommandsLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 04/11] ShellPkg/UefiShellLevel1CommandsLib: " Ruiyu Ni
` (9 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c | 3 ---
ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c | 1 -
ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c | 1 -
ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c | 9 ---------
ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c | 1 -
ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c | 4 ----
ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c | 7 -------
ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c | 1 -
ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c | 1 -
.../UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h | 1 -
ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c | 1 -
11 files changed, 30 deletions(-)
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
index dd3d4a6..dd868a7 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
@@ -113,7 +113,6 @@ ShellConnectPciRootBridge (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ConnectControllers (
IN CONST EFI_HANDLE ControllerHandle OPTIONAL,
IN CONST EFI_HANDLE DriverHandle OPTIONAL,
@@ -194,7 +193,6 @@ ConnectControllers (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ShellConnectFromDevPaths (
IN CONST CHAR16 *Key
)
@@ -353,7 +351,6 @@ ShellConnectFromDevPaths (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ConvertAndConnectControllers (
IN EFI_HANDLE *Handle1 OPTIONAL,
IN EFI_HANDLE *Handle2 OPTIONAL,
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
index 237cb85..6f070ee 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
@@ -34,7 +34,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
DoDevTreeForHandle(
IN CONST EFI_HANDLE TheHandle,
IN CONST CHAR8 *Lang OPTIONAL,
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
index d229b35..b725178 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
@@ -42,7 +42,6 @@
@retval EFI_INVALID_PARAMETER A parameter was invalid.
**/
EFI_STATUS
-EFIAPI
GetDeviceHandleInfo (
IN EFI_HANDLE TheHandle,
IN OUT CHAR16 *Type,
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index 0a1b9a9..00a4c10 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -53,7 +53,6 @@ STATIC CONST EFI_GUID *UefiDriverModelProtocolsGuidArray[] = {
@retval EFI_SUCCESS The name was found.
**/
EFI_STATUS
-EFIAPI
GetDriverName (
IN EFI_HANDLE TheHandle,
IN CONST CHAR8 *Language,
@@ -107,7 +106,6 @@ GetDriverName (
@retval FALSE The guid does not represent a driver model protocol.
**/
BOOLEAN
-EFIAPI
IsDriverProt (
IN CONST EFI_GUID *Guid
)
@@ -140,7 +138,6 @@ IsDriverProt (
@retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.
**/
CHAR16*
-EFIAPI
GetProtocolInfoString(
IN CONST EFI_HANDLE TheHandle,
IN CONST CHAR8 *Language,
@@ -217,7 +214,6 @@ GetProtocolInfoString(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
GetDriverImageName (
IN EFI_HANDLE TheHandle,
OUT CHAR16 **Name
@@ -256,7 +252,6 @@ GetDriverImageName (
@param[in] Language The language to output in.
**/
EFI_STATUS
-EFIAPI
DisplayDriverModelHandle (
IN EFI_HANDLE Handle,
IN BOOLEAN BestName,
@@ -648,7 +643,6 @@ DisplayDriverModelHandle (
@retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.
**/
SHELL_STATUS
-EFIAPI
DoDhByHandle(
IN CONST EFI_HANDLE TheHandle,
IN CONST BOOLEAN Verbose,
@@ -729,7 +723,6 @@ DoDhByHandle(
@retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.
**/
SHELL_STATUS
-EFIAPI
DoDhForHandleList(
IN CONST EFI_HANDLE *HandleList,
IN CONST BOOLEAN Verbose,
@@ -772,7 +765,6 @@ DoDhForHandleList(
@retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.
**/
SHELL_STATUS
-EFIAPI
DoDhForAll(
IN CONST BOOLEAN Sfo,
IN CONST BOOLEAN Verbose,
@@ -810,7 +802,6 @@ DoDhForAll(
@retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.
**/
SHELL_STATUS
-EFIAPI
DoDhByProtocol(
IN CONST CHAR16 *ProtocolName,
IN CONST BOOLEAN Verbose,
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
index adca80e..1fd7b19 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
@@ -28,7 +28,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
DisconnectAll(
VOID
)
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index d6d75f0..ffdef04 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
@@ -33,7 +33,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
free this memory.
**/
CHAR16*
-EFIAPI
GetDevicePathTextForHandle(
IN EFI_HANDLE TheHandle
)
@@ -98,7 +97,6 @@ GetDevicePathTextForHandle(
@retval FALSE The driver does not have Driver Configuration.
**/
BOOLEAN
-EFIAPI
ReturnDriverConfig(
IN CONST EFI_HANDLE TheHandle
)
@@ -120,7 +118,6 @@ ReturnDriverConfig(
@retval FALSE The driver does not have Driver Diagnostics.
**/
BOOLEAN
-EFIAPI
ReturnDriverDiag(
IN CONST EFI_HANDLE TheHandle
)
@@ -145,7 +142,6 @@ ReturnDriverDiag(
@retval 0xFFFFFFFF An error ocurred.
**/
UINT32
-EFIAPI
ReturnDriverVersion(
IN CONST EFI_HANDLE TheHandle
)
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
index cc1c9ca..37501d4 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
@@ -30,7 +30,6 @@ STATIC CONST EFI_GUID *CfgGuidList[] = {&gEfiDriverConfigurationProtocolGuid, &g
@retval EFI_NOT_FOUND There was no EFI_HII_HANDLE found for that deviec path.
**/
EFI_STATUS
-EFIAPI
FindHiiHandleViaDevPath(
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1,
OUT EFI_HII_HANDLE *HiiHandle,
@@ -124,7 +123,6 @@ FindHiiHandleViaDevPath(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ConvertHandleToHiiHandle(
IN CONST EFI_HANDLE Handle,
OUT EFI_HII_HANDLE *HiiHandle,
@@ -159,7 +157,6 @@ ConvertHandleToHiiHandle(
@param[in] FileName The filename to rwite the info to.
**/
SHELL_STATUS
-EFIAPI
ConfigToFile(
IN CONST EFI_HANDLE Handle,
IN CONST CHAR16 *FileName
@@ -269,7 +266,6 @@ ConfigToFile(
@param[in] FileName The filename to read the info from.
**/
SHELL_STATUS
-EFIAPI
ConfigFromFile(
IN EFI_HANDLE Handle,
IN CONST CHAR16 *FileName
@@ -486,7 +482,6 @@ ConfigFromFile(
@retval SHELL_INVALID_PARAMETER A parameter has a invalid value.
**/
EFI_STATUS
-EFIAPI
ShellCmdDriverConfigurationProcessActionRequired (
EFI_HANDLE DriverImageHandle,
EFI_HANDLE ControllerHandle,
@@ -554,7 +549,6 @@ ShellCmdDriverConfigurationProcessActionRequired (
@retval SHELL_INVALID_PARAMETER A parameter has a invalid value.
**/
SHELL_STATUS
-EFIAPI
PreHiiDrvCfg (
IN CONST CHAR8 *Language,
IN BOOLEAN ForceDefaults,
@@ -1062,7 +1056,6 @@ Done:
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
PrintConfigInfoOnAll(
IN CONST BOOLEAN ChildrenToo,
IN CONST CHAR8 *Language,
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
index 04f6a58..cc1099f 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -42,7 +42,6 @@ typedef enum {
@retval EFI_NOT_FOUND No diagnostic handle could be found.
**/
EFI_STATUS
-EFIAPI
DoDiagnostics (
IN CONST DRV_DIAG_TEST_MODE Mode,
IN CONST CHAR8 *Lang,
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
index e11873a..2a1748c 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
@@ -33,7 +33,6 @@ STATIC CONST CHAR16 StringUnknown[] = L"Unknown ";
@retval EFI_INVALID_PARAMETER TheHandle was NULL.
**/
EFI_STATUS
-EFIAPI
TraverseHandleDatabase (
IN CONST EFI_HANDLE TheHandle
)
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
index c65d0ed..7d1a601 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
@@ -215,7 +215,6 @@ ShellCommandRunUnload (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ShellConnectFromDevPaths (
IN CONST CHAR16 *Key
);
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
index 0d48f9d..b5f085a 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
@@ -24,7 +24,6 @@
@retval EFI_INVALID_PARAMETER The handle did not have LoadedImage
**/
EFI_STATUS
-EFIAPI
DumpLoadedImageProtocolInfo (
IN EFI_HANDLE TheHandle
)
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 04/11] ShellPkg/UefiShellLevel1CommandsLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (2 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 03/11] ShellPkg/UefiShellDriver1CommandsLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: " Ruiyu Ni
` (8 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellLevel1CommandsLib/For.c | 5 -----
ShellPkg/Library/UefiShellLevel1CommandsLib/If.c | 6 ------
.../Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c | 2 --
.../Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h | 1 -
4 files changed, 14 deletions(-)
diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
index 6cfe8a7..3db4bb5 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
@@ -25,7 +25,6 @@
@retval FALSE The number is not valid.
**/
BOOLEAN
-EFIAPI
ShellIsValidForNumber (
IN CONST CHAR16 *Number
)
@@ -129,7 +128,6 @@ typedef struct {
@retval EFI_OUT_OF_RESOURCES There was not enough free memory.
**/
EFI_STATUS
-EFIAPI
InternalUpdateAliasOnList(
IN CONST CHAR16 *Alias,
IN CONST CHAR16 *CommandString,
@@ -185,7 +183,6 @@ InternalUpdateAliasOnList(
@retval FALSE The alias is not on the list.
**/
BOOLEAN
-EFIAPI
InternalIsAliasOnList(
IN CONST CHAR16 *Alias,
IN CONST LIST_ENTRY *List
@@ -221,7 +218,6 @@ InternalIsAliasOnList(
@param[in, out] List The list to search.
**/
BOOLEAN
-EFIAPI
InternalRemoveAliasFromList(
IN CONST CHAR16 *Alias,
IN OUT LIST_ENTRY *List
@@ -264,7 +260,6 @@ InternalRemoveAliasFromList(
@retval (UINTN)(-1) An error ocurred.
**/
UINTN
-EFIAPI
ReturnUintn(
IN CONST CHAR16 *String
)
diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
index 37e196c..35c5ca6 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
@@ -92,7 +92,6 @@ IsNextFragment (
@retval FALSE String is not a valid profile.
**/
BOOLEAN
-EFIAPI
IsValidProfile (
IN CONST CHAR16 *String
)
@@ -121,7 +120,6 @@ IsValidProfile (
@return The result of the comparison.
**/
BOOLEAN
-EFIAPI
TestOperation (
IN CONST CHAR16 *Compare1,
IN CONST CHAR16 *Compare2,
@@ -351,7 +349,6 @@ TestOperation (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ProcessStatement (
IN OUT BOOLEAN *PassingState,
IN UINTN StartParameterNumber,
@@ -661,7 +658,6 @@ ProcessStatement (
@retval FALSE A valid statement was not found.
**/
BOOLEAN
-EFIAPI
BuildNextStatement (
IN UINTN ParameterNumber,
OUT UINTN *EndParameter,
@@ -713,7 +709,6 @@ BuildNextStatement (
@retval FALSE Something went wrong.
**/
BOOLEAN
-EFIAPI
MoveToTagSpecial (
IN SCRIPT_FILE *ScriptFile
)
@@ -804,7 +799,6 @@ MoveToTagSpecial (
@retval EFI_NOT_FOUND The ending tag could not be found.
**/
EFI_STATUS
-EFIAPI
PerformResultOperation (
IN CONST BOOLEAN Result
)
diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
index 80d0dfe..2b8a104 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
@@ -121,7 +121,6 @@ ShellLevel1CommandsLibDestructor (
@param[in, out] TargetCount The pointer to the current count.
**/
BOOLEAN
-EFIAPI
TestNodeForMove (
IN CONST LIST_MANIP_FUNC Function,
IN CONST CHAR16 *DecrementerTag,
@@ -246,7 +245,6 @@ TestNodeForMove (
searching.
**/
BOOLEAN
-EFIAPI
MoveToTag (
IN CONST LIST_MANIP_FUNC Function,
IN CONST CHAR16 *DecrementerTag,
diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
index c4ef536..292abbf 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
@@ -195,7 +195,6 @@ LIST_ENTRY *
searching.
**/
BOOLEAN
-EFIAPI
MoveToTag (
IN CONST LIST_MANIP_FUNC Function,
IN CONST CHAR16 *DecrementerTag,
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (3 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 04/11] ShellPkg/UefiShellLevel1CommandsLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2017-08-03 19:06 ` Palmer, Thomas
2016-09-30 8:17 ` [PATCH 06/11] ShellPkg/UefiShellLevel3CommandsLib: " Ruiyu Ni
` (7 subsequent siblings)
12 siblings, 1 reply; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 ----
ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 --
ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 -----
ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------------
ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 -------
ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c | 3 ---
ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 ---
ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 ----
.../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c | 5 -----
.../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h | 6 ------
ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
12 files changed, 53 deletions(-)
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index eb1f3b6..b8f6d31 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -35,7 +35,6 @@
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
SHELL_STATUS
-EFIAPI
ValidateAndCopyFiles(
IN CONST EFI_SHELL_FILE_INFO *FileList,
IN CONST CHAR16 *DestDir,
@@ -58,7 +57,6 @@ ValidateAndCopyFiles(
@retval SHELL_SUCCESS The source file was copied to the destination
**/
SHELL_STATUS
-EFIAPI
CopySingleFile(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Dest,
@@ -291,7 +289,6 @@ CopySingleFile(
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
SHELL_STATUS
-EFIAPI
ValidateAndCopyFiles(
IN CONST EFI_SHELL_FILE_INFO *FileList,
IN CONST CHAR16 *DestDir,
@@ -576,7 +573,6 @@ ValidateAndCopyFiles(
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
ProcessValidateAndCopyFiles(
IN EFI_SHELL_FILE_INFO *FileList,
IN CONST CHAR16 *DestDir,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
index ff7c818..322d510 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
@@ -28,7 +28,6 @@
**/
EFI_STATUS
-EFIAPI
ConnectAllEfi (
VOID
)
@@ -74,7 +73,6 @@ ConnectAllEfi (
@retval EFI_OUT_OF_RESOURCES there was insufficient memory
**/
EFI_STATUS
-EFIAPI
LoadDriver(
IN CONST CHAR16 *FileName,
IN CONST BOOLEAN Connect
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 9b4c452..52ae18f 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -22,7 +22,6 @@
@param[in] TheList a list of files from the volume.
**/
EFI_STATUS
-EFIAPI
PrintSfoVolumeInfoTableEntry(
IN CONST EFI_SHELL_FILE_INFO *TheList
)
@@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
**/
VOID
-EFIAPI
PrintFileInformation(
IN CONST BOOLEAN Sfo,
IN CONST EFI_SHELL_FILE_INFO *TheNode,
@@ -263,7 +261,6 @@ PrintFileInformation(
@param[in] Path String with starting path.
**/
VOID
-EFIAPI
PrintNonSfoHeader(
IN CONST CHAR16 *Path
)
@@ -300,7 +297,6 @@ PrintNonSfoHeader(
@param[in] Dirs The number of directories.
**/
VOID
-EFIAPI
PrintNonSfoFooter(
IN UINT64 Files,
IN UINT64 Size,
@@ -339,7 +335,6 @@ PrintNonSfoFooter(
@retval SHELL_SUCCESS the printing was sucessful.
**/
SHELL_STATUS
-EFIAPI
PrintLsOutput(
IN CONST BOOLEAN Rec,
IN CONST UINT64 Attribs,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 035aff1..20eb528 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -34,7 +34,6 @@
@retval FALSE String has at least one other character.
**/
BOOLEAN
-EFIAPI
IsNumberLetterOnly(
IN CONST CHAR16 *String,
IN CONST UINTN Len
@@ -65,7 +64,6 @@ IsNumberLetterOnly(
items (";" normally).
**/
BOOLEAN
-EFIAPI
SearchList(
IN CONST CHAR16 *List,
IN CONST CHAR16 *MetaTarget,
@@ -133,7 +131,6 @@ SearchList(
@retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
**/
CHAR16*
-EFIAPI
GetDeviceMediaType (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -179,7 +176,6 @@ GetDeviceMediaType (
@retval FALSE The handle does not have removable storage.
**/
BOOLEAN
-EFIAPI
IsRemoveableDevice (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -216,7 +212,6 @@ IsRemoveableDevice (
@retval FALSE The map should not be displayed.
**/
BOOLEAN
-EFIAPI
MappingListHasType(
IN CONST CHAR16 *MapList,
IN CONST CHAR16 *Specific,
@@ -287,7 +282,6 @@ MappingListHasType(
@retval EFI_SUCCESS The mapping was displayed.
**/
EFI_STATUS
-EFIAPI
PerformSingleMappingDisplay(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
@retval EFI_NOT_FOUND Name was not a map on Handle.
**/
EFI_STATUS
-EFIAPI
PerformSingleMappingDelete(
IN CONST CHAR16 *Specific,
IN CONST EFI_HANDLE Handle
@@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
**/
SHELL_STATUS
-EFIAPI
PerformMappingDisplay(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -690,7 +682,6 @@ PerformMappingDisplay(
@sa PerformMappingDisplay
**/
SHELL_STATUS
-EFIAPI
PerformMappingDisplay2(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -743,7 +734,6 @@ PerformMappingDisplay2(
@retval EFI_NOT_FOUND Specific could not be found.
**/
EFI_STATUS
-EFIAPI
PerformMappingDelete(
IN CONST CHAR16 *Specific
)
@@ -874,7 +864,6 @@ PerformMappingDelete(
**/
SHELL_STATUS
-EFIAPI
AddMappingFromMapping(
IN CONST CHAR16 *Map,
IN CONST CHAR16 *SName
@@ -931,7 +920,6 @@ AddMappingFromMapping(
**/
SHELL_STATUS
-EFIAPI
AddMappingFromHandle(
IN CONST EFI_HANDLE Handle,
IN CONST CHAR16 *SName
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index f93772c..efaaeb2 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -26,7 +26,6 @@
@retval FALSE The move is within a file system.
**/
BOOLEAN
-EFIAPI
IsBetweenFileSystem(
IN CONST CHAR16 *FullName,
IN CONST CHAR16 *Cwd,
@@ -79,7 +78,6 @@ IsBetweenFileSystem(
@retval FALSE The move is not
**/
BOOLEAN
-EFIAPI
IsValidMove(
IN CONST CHAR16 *SourcePath,
IN CONST CHAR16 *Cwd,
@@ -161,7 +159,6 @@ IsValidMove(
@retval SHELL_SUCCESS The operation was sucessful.
**/
SHELL_STATUS
-EFIAPI
GetDestinationLocation(
IN CONST CHAR16 *DestParameter,
IN OUT CHAR16 **DestPathPointer,
@@ -286,7 +283,6 @@ GetDestinationLocation(
@retval SHELL_SUCCESS The source file was moved to the destination.
**/
EFI_STATUS
-EFIAPI
MoveBetweenFileSystems(
IN EFI_SHELL_FILE_INFO *Node,
IN CONST CHAR16 *DestPath,
@@ -334,7 +330,6 @@ MoveBetweenFileSystems(
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
EFI_STATUS
-EFIAPI
CreateFullDestPath(
IN CONST CHAR16 **DestPath,
OUT CHAR16 **FullDestPath,
@@ -373,7 +368,6 @@ CreateFullDestPath(
@retval SHELL_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MoveWithinFileSystems(
IN EFI_SHELL_FILE_INFO *Node,
IN CHAR16 *DestPath,
@@ -454,7 +448,6 @@ MoveWithinFileSystems(
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
SHELL_STATUS
-EFIAPI
ValidateAndMoveFiles(
IN EFI_SHELL_FILE_INFO *FileList,
OUT VOID **Resp,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
index 12fe877..4b1973a 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
@@ -78,7 +78,6 @@ IsStdInDataAvailable (
Size was updated to the minimum space required.
**/
EFI_STATUS
-EFIAPI
ShellFileHandleReadStdInLine(
IN SHELL_FILE_HANDLE Handle,
IN OUT CHAR16 *Buffer,
@@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
@sa ShellFileHandleReadLine
**/
CHAR16*
-EFIAPI
ParseReturnStdInLine (
IN SHELL_FILE_HANDLE Handle
)
@@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
PerformParsing(
IN CONST CHAR16 *FileName,
IN CONST CHAR16 *TableName,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
index 0b23fba..618610d 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
@@ -29,7 +29,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
@retval FALSE The directory has at least 1 file or directory in it.
**/
BOOLEAN
-EFIAPI
IsDirectoryEmpty (
IN EFI_HANDLE FileHandle
)
@@ -66,7 +65,6 @@ IsDirectoryEmpty (
@retval SHELL_DEVICE_ERROR A device error occured reading this Node.
**/
SHELL_STATUS
-EFIAPI
CascadeDelete(
IN EFI_SHELL_FILE_INFO *Node,
IN CONST BOOLEAN Quiet
@@ -195,7 +193,6 @@ CascadeDelete(
@param[in] Package RESERVED. Not used.
**/
BOOLEAN
-EFIAPI
IsValidDeleteTarget(
IN CONST EFI_SHELL_FILE_INFO *List,
IN CONST EFI_SHELL_FILE_INFO *Node,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
index d5e6a08..7ca1942 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
@@ -24,7 +24,6 @@
@return any return code from GetNextVariableName except EFI_NOT_FOUND
**/
SHELL_STATUS
-EFIAPI
PrintAllShellEnvVars(
VOID
)
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
index 533519d..3ebc72a 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
@@ -28,7 +28,6 @@
@retval FALSE String is invalid.
**/
BOOLEAN
-EFIAPI
InternalIsTimeLikeString (
IN CONST CHAR16 *String,
IN CONST CHAR16 Char,
@@ -87,7 +86,6 @@ InternalIsTimeLikeString (
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
CheckAndSetDate (
IN CONST CHAR16 *DateString
)
@@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
CheckAndSetTime (
IN CONST CHAR16 *TimeString,
IN CONST INT16 Tz,
@@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeZoneParamList3[] = {
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
CheckAndSetTimeZone (
IN CONST CHAR16 *TimeZoneString
)
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index 0dafb19..1491ee9 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
@@ -169,7 +169,6 @@ ShellLevel2CommandsLibDestructor (
@retval other An allocated pointer to a fuly qualified path.
**/
CHAR16*
-EFIAPI
GetFullyQualifiedPath(
IN CONST CHAR16* Path
)
@@ -216,7 +215,6 @@ GetFullyQualifiedPath(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
VerifyIntermediateDirectories (
IN CONST CHAR16 *Path
)
@@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
@return Char as an upper case character.
**/
CHAR16
-EFIAPI
InternalCharToUpper (
IN CONST CHAR16 Char
);
@@ -286,7 +283,6 @@ InternalCharToUpper (
@return The location in Source where there is a difference.
**/
CONST CHAR16*
-EFIAPI
StrniCmp(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Target,
@@ -322,7 +318,6 @@ StrniCmp(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ShellLevel2StripQuotes (
IN CONST CHAR16 *OriginalString,
OUT CHAR16 **CleanString
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index 634515e..19e46a1 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
@@ -263,7 +263,6 @@ ShellCommandRunMv (
@retval other pointer to a fuly qualified path.
**/
CHAR16*
-EFIAPI
GetFullyQualifiedPath(
IN CONST CHAR16* Path
);
@@ -276,7 +275,6 @@ GetFullyQualifiedPath(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
VerifyIntermediateDirectories (
IN CONST CHAR16 *Path
);
@@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
@return non-zero if the strings are different.
**/
CONST CHAR16*
-EFIAPI
StrniCmp(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Target,
@@ -310,7 +307,6 @@ StrniCmp(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ShellLevel2StripQuotes (
IN CONST CHAR16 *OriginalString,
OUT CHAR16 **CleanString
@@ -343,7 +339,6 @@ ShellCommandRunVol (
@retval SHELL_SUCCESS The source file was copied to the destination
**/
SHELL_STATUS
-EFIAPI
CopySingleFile(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Dest,
@@ -364,7 +359,6 @@ CopySingleFile(
@retval SHELL_DEVICE_ERROR A device error occured reading this Node.
**/
SHELL_STATUS
-EFIAPI
CascadeDelete(
IN EFI_SHELL_FILE_INFO *Node,
IN CONST BOOLEAN Quiet
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
index a6f0296..f911c7e 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
@@ -27,7 +27,6 @@
@retval SHELL_SUCCESS The operation was sucessful.
**/
SHELL_STATUS
-EFIAPI
HandleVol(
IN CONST CHAR16 *Path,
IN CONST BOOLEAN Delete,
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
2016-09-30 8:17 ` [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: " Ruiyu Ni
@ 2017-08-03 19:06 ` Palmer, Thomas
2017-08-07 5:56 ` Ni, Ruiyu
0 siblings, 1 reply; 21+ messages in thread
From: Palmer, Thomas @ 2017-08-03 19:06 UTC (permalink / raw)
To: Ruiyu Ni, edk2-devel@lists.01.org
Ruiyu,
Sorry for replying to old patch, I was cleaning out some old sandboxes when I stumbled onto this issue.
Why is EFIAPI removed from InternalCharToUpper in UefiShellLevel2CommandsLib.c? It is present in both BaseLibInternals.h and String.c. Without EFIAPI, GCC builds of this function can fail
Regards,
Thomas Palmer
"I have only made this letter longer because I have not had the time to make it shorter" - Blaise Pascal
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu Ni
Sent: Friday, September 30, 2016 3:18 AM
To: edk2-devel@lists.01.org
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>; Jaben Carsey <jaben.carsey@intel.com>; Chen A Chen <chen.a.chen@intel.com>
Subject: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 ----
ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 --
ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 -----
ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------------
ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 -------
ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c | 3 ---
ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 ---
ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 ----
.../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c | 5 ----- .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h | 6 ------
ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
12 files changed, 53 deletions(-)
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index eb1f3b6..b8f6d31 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -35,7 +35,6 @@
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
SHELL_STATUS
-EFIAPI
ValidateAndCopyFiles(
IN CONST EFI_SHELL_FILE_INFO *FileList,
IN CONST CHAR16 *DestDir,
@@ -58,7 +57,6 @@ ValidateAndCopyFiles(
@retval SHELL_SUCCESS The source file was copied to the destination
**/
SHELL_STATUS
-EFIAPI
CopySingleFile(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Dest,
@@ -291,7 +289,6 @@ CopySingleFile(
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
SHELL_STATUS
-EFIAPI
ValidateAndCopyFiles(
IN CONST EFI_SHELL_FILE_INFO *FileList,
IN CONST CHAR16 *DestDir,
@@ -576,7 +573,6 @@ ValidateAndCopyFiles(
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
ProcessValidateAndCopyFiles(
IN EFI_SHELL_FILE_INFO *FileList,
IN CONST CHAR16 *DestDir,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
index ff7c818..322d510 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
@@ -28,7 +28,6 @@
**/
EFI_STATUS
-EFIAPI
ConnectAllEfi (
VOID
)
@@ -74,7 +73,6 @@ ConnectAllEfi (
@retval EFI_OUT_OF_RESOURCES there was insufficient memory **/ EFI_STATUS -EFIAPI LoadDriver(
IN CONST CHAR16 *FileName,
IN CONST BOOLEAN Connect
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 9b4c452..52ae18f 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -22,7 +22,6 @@
@param[in] TheList a list of files from the volume.
**/
EFI_STATUS
-EFIAPI
PrintSfoVolumeInfoTableEntry(
IN CONST EFI_SHELL_FILE_INFO *TheList
)
@@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
**/
VOID
-EFIAPI
PrintFileInformation(
IN CONST BOOLEAN Sfo,
IN CONST EFI_SHELL_FILE_INFO *TheNode, @@ -263,7 +261,6 @@ PrintFileInformation(
@param[in] Path String with starting path.
**/
VOID
-EFIAPI
PrintNonSfoHeader(
IN CONST CHAR16 *Path
)
@@ -300,7 +297,6 @@ PrintNonSfoHeader(
@param[in] Dirs The number of directories.
**/
VOID
-EFIAPI
PrintNonSfoFooter(
IN UINT64 Files,
IN UINT64 Size,
@@ -339,7 +335,6 @@ PrintNonSfoFooter(
@retval SHELL_SUCCESS the printing was sucessful.
**/
SHELL_STATUS
-EFIAPI
PrintLsOutput(
IN CONST BOOLEAN Rec,
IN CONST UINT64 Attribs,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 035aff1..20eb528 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -34,7 +34,6 @@
@retval FALSE String has at least one other character.
**/
BOOLEAN
-EFIAPI
IsNumberLetterOnly(
IN CONST CHAR16 *String,
IN CONST UINTN Len
@@ -65,7 +64,6 @@ IsNumberLetterOnly(
items (";" normally).
**/
BOOLEAN
-EFIAPI
SearchList(
IN CONST CHAR16 *List,
IN CONST CHAR16 *MetaTarget,
@@ -133,7 +131,6 @@ SearchList(
@retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
**/
CHAR16*
-EFIAPI
GetDeviceMediaType (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -179,7 +176,6 @@ GetDeviceMediaType (
@retval FALSE The handle does not have removable storage.
**/
BOOLEAN
-EFIAPI
IsRemoveableDevice (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -216,7 +212,6 @@ IsRemoveableDevice (
@retval FALSE The map should not be displayed.
**/
BOOLEAN
-EFIAPI
MappingListHasType(
IN CONST CHAR16 *MapList,
IN CONST CHAR16 *Specific,
@@ -287,7 +282,6 @@ MappingListHasType(
@retval EFI_SUCCESS The mapping was displayed.
**/
EFI_STATUS
-EFIAPI
PerformSingleMappingDisplay(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
@retval EFI_NOT_FOUND Name was not a map on Handle.
**/
EFI_STATUS
-EFIAPI
PerformSingleMappingDelete(
IN CONST CHAR16 *Specific,
IN CONST EFI_HANDLE Handle
@@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
**/
SHELL_STATUS
-EFIAPI
PerformMappingDisplay(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -690,7 +682,6 @@ PerformMappingDisplay(
@sa PerformMappingDisplay
**/
SHELL_STATUS
-EFIAPI
PerformMappingDisplay2(
IN CONST BOOLEAN Verbose,
IN CONST BOOLEAN Consist,
@@ -743,7 +734,6 @@ PerformMappingDisplay2(
@retval EFI_NOT_FOUND Specific could not be found.
**/
EFI_STATUS
-EFIAPI
PerformMappingDelete(
IN CONST CHAR16 *Specific
)
@@ -874,7 +864,6 @@ PerformMappingDelete(
**/
SHELL_STATUS
-EFIAPI
AddMappingFromMapping(
IN CONST CHAR16 *Map,
IN CONST CHAR16 *SName
@@ -931,7 +920,6 @@ AddMappingFromMapping(
**/
SHELL_STATUS
-EFIAPI
AddMappingFromHandle(
IN CONST EFI_HANDLE Handle,
IN CONST CHAR16 *SName
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index f93772c..efaaeb2 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -26,7 +26,6 @@
@retval FALSE The move is within a file system.
**/
BOOLEAN
-EFIAPI
IsBetweenFileSystem(
IN CONST CHAR16 *FullName,
IN CONST CHAR16 *Cwd,
@@ -79,7 +78,6 @@ IsBetweenFileSystem(
@retval FALSE The move is not
**/
BOOLEAN
-EFIAPI
IsValidMove(
IN CONST CHAR16 *SourcePath,
IN CONST CHAR16 *Cwd,
@@ -161,7 +159,6 @@ IsValidMove(
@retval SHELL_SUCCESS The operation was sucessful.
**/
SHELL_STATUS
-EFIAPI
GetDestinationLocation(
IN CONST CHAR16 *DestParameter,
IN OUT CHAR16 **DestPathPointer,
@@ -286,7 +283,6 @@ GetDestinationLocation(
@retval SHELL_SUCCESS The source file was moved to the destination.
**/
EFI_STATUS
-EFIAPI
MoveBetweenFileSystems(
IN EFI_SHELL_FILE_INFO *Node,
IN CONST CHAR16 *DestPath,
@@ -334,7 +330,6 @@ MoveBetweenFileSystems(
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
EFI_STATUS
-EFIAPI
CreateFullDestPath(
IN CONST CHAR16 **DestPath,
OUT CHAR16 **FullDestPath,
@@ -373,7 +368,6 @@ CreateFullDestPath(
@retval SHELL_OUT_OF_RESOURCES A memory allocation failed.
**/
EFI_STATUS
-EFIAPI
MoveWithinFileSystems(
IN EFI_SHELL_FILE_INFO *Node,
IN CHAR16 *DestPath,
@@ -454,7 +448,6 @@ MoveWithinFileSystems(
@retval SHELL_OUT_OF_RESOURCES a memory allocation failed
**/
SHELL_STATUS
-EFIAPI
ValidateAndMoveFiles(
IN EFI_SHELL_FILE_INFO *FileList,
OUT VOID **Resp,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
index 12fe877..4b1973a 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
@@ -78,7 +78,6 @@ IsStdInDataAvailable (
Size was updated to the minimum space required.
**/
EFI_STATUS
-EFIAPI
ShellFileHandleReadStdInLine(
IN SHELL_FILE_HANDLE Handle,
IN OUT CHAR16 *Buffer,
@@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
@sa ShellFileHandleReadLine
**/
CHAR16*
-EFIAPI
ParseReturnStdInLine (
IN SHELL_FILE_HANDLE Handle
)
@@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
PerformParsing(
IN CONST CHAR16 *FileName,
IN CONST CHAR16 *TableName,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
index 0b23fba..618610d 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
@@ -29,7 +29,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
@retval FALSE The directory has at least 1 file or directory in it.
**/
BOOLEAN
-EFIAPI
IsDirectoryEmpty (
IN EFI_HANDLE FileHandle
)
@@ -66,7 +65,6 @@ IsDirectoryEmpty (
@retval SHELL_DEVICE_ERROR A device error occured reading this Node.
**/
SHELL_STATUS
-EFIAPI
CascadeDelete(
IN EFI_SHELL_FILE_INFO *Node,
IN CONST BOOLEAN Quiet
@@ -195,7 +193,6 @@ CascadeDelete(
@param[in] Package RESERVED. Not used.
**/
BOOLEAN
-EFIAPI
IsValidDeleteTarget(
IN CONST EFI_SHELL_FILE_INFO *List,
IN CONST EFI_SHELL_FILE_INFO *Node,
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
index d5e6a08..7ca1942 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
@@ -24,7 +24,6 @@
@return any return code from GetNextVariableName except EFI_NOT_FOUND **/ SHELL_STATUS -EFIAPI PrintAllShellEnvVars(
VOID
)
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
index 533519d..3ebc72a 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
@@ -28,7 +28,6 @@
@retval FALSE String is invalid.
**/
BOOLEAN
-EFIAPI
InternalIsTimeLikeString (
IN CONST CHAR16 *String,
IN CONST CHAR16 Char,
@@ -87,7 +86,6 @@ InternalIsTimeLikeString (
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
CheckAndSetDate (
IN CONST CHAR16 *DateString
)
@@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
CheckAndSetTime (
IN CONST CHAR16 *TimeString,
IN CONST INT16 Tz,
@@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeZoneParamList3[] = {
@retval SHELL_SUCCESS The operation was successful.
**/
SHELL_STATUS
-EFIAPI
CheckAndSetTimeZone (
IN CONST CHAR16 *TimeZoneString
)
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index 0dafb19..1491ee9 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
+++ sLib.c
@@ -169,7 +169,6 @@ ShellLevel2CommandsLibDestructor (
@retval other An allocated pointer to a fuly qualified path.
**/
CHAR16*
-EFIAPI
GetFullyQualifiedPath(
IN CONST CHAR16* Path
)
@@ -216,7 +215,6 @@ GetFullyQualifiedPath(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
VerifyIntermediateDirectories (
IN CONST CHAR16 *Path
)
@@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
@return Char as an upper case character.
**/
CHAR16
-EFIAPI
InternalCharToUpper (
IN CONST CHAR16 Char
);
@@ -286,7 +283,6 @@ InternalCharToUpper (
@return The location in Source where there is a difference.
**/
CONST CHAR16*
-EFIAPI
StrniCmp(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Target,
@@ -322,7 +318,6 @@ StrniCmp(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ShellLevel2StripQuotes (
IN CONST CHAR16 *OriginalString,
OUT CHAR16 **CleanString
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index 634515e..19e46a1 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
+++ sLib.h
@@ -263,7 +263,6 @@ ShellCommandRunMv (
@retval other pointer to a fuly qualified path.
**/
CHAR16*
-EFIAPI
GetFullyQualifiedPath(
IN CONST CHAR16* Path
);
@@ -276,7 +275,6 @@ GetFullyQualifiedPath(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
VerifyIntermediateDirectories (
IN CONST CHAR16 *Path
);
@@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
@return non-zero if the strings are different.
**/
CONST CHAR16*
-EFIAPI
StrniCmp(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Target,
@@ -310,7 +307,6 @@ StrniCmp(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
ShellLevel2StripQuotes (
IN CONST CHAR16 *OriginalString,
OUT CHAR16 **CleanString
@@ -343,7 +339,6 @@ ShellCommandRunVol (
@retval SHELL_SUCCESS The source file was copied to the destination
**/
SHELL_STATUS
-EFIAPI
CopySingleFile(
IN CONST CHAR16 *Source,
IN CONST CHAR16 *Dest,
@@ -364,7 +359,6 @@ CopySingleFile(
@retval SHELL_DEVICE_ERROR A device error occured reading this Node.
**/
SHELL_STATUS
-EFIAPI
CascadeDelete(
IN EFI_SHELL_FILE_INFO *Node,
IN CONST BOOLEAN Quiet
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
index a6f0296..f911c7e 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
@@ -27,7 +27,6 @@
@retval SHELL_SUCCESS The operation was sucessful.
**/
SHELL_STATUS
-EFIAPI
HandleVol(
IN CONST CHAR16 *Path,
IN CONST BOOLEAN Delete,
--
2.9.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
2017-08-03 19:06 ` Palmer, Thomas
@ 2017-08-07 5:56 ` Ni, Ruiyu
2017-08-07 17:01 ` Palmer, Thomas
2017-08-09 23:39 ` Palmer, Thomas
0 siblings, 2 replies; 21+ messages in thread
From: Ni, Ruiyu @ 2017-08-07 5:56 UTC (permalink / raw)
To: Palmer, Thomas, edk2-devel@lists.01.org, Kinney, Michael D
Because an internal function doesn't need to have EFIAPI prefix.
I think a proper fix is to change both BaseLib and UefiShellLevel2CommandsLib to add prefix to the function name.
e.g.: ShellLevel2CommandsLibCharToUpper, BaseLibCharToUpper.
And I am also surprised that BaseLib's version also has the EFIAPI prefix.
---BaseLib/String.c---
CHAR16
EFIAPI
InternalCharToUpper (
IN CHAR16 Char
)
Copying Mike for comments.
Thanks/Ray
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Palmer, Thomas
> Sent: Friday, August 4, 2017 3:07 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Subject: Re: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
> Remove unnecessary EFIAPI
>
> Ruiyu,
> Sorry for replying to old patch, I was cleaning out some old
> sandboxes when I stumbled onto this issue.
>
> Why is EFIAPI removed from InternalCharToUpper in
> UefiShellLevel2CommandsLib.c? It is present in both BaseLibInternals.h and
> String.c. Without EFIAPI, GCC builds of this function can fail
>
>
> Regards,
>
> Thomas Palmer
>
> "I have only made this letter longer because I have not had the time to make
> it shorter" - Blaise Pascal
>
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Friday, September 30, 2016 3:18 AM
> To: edk2-devel@lists.01.org
> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>; Jaben Carsey <jaben.carsey@intel.com>;
> Chen A Chen <chen.a.chen@intel.com>
> Subject: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
> Remove unnecessary EFIAPI
>
> From: Ruiyu Ni <Ruiyu.ni@intel.com>
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
> ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 ----
> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 -----
> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 -------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c | 3 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
> ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 ----
> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c | 5 -----
> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h | 6 ------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
> 12 files changed, 53 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> index eb1f3b6..b8f6d31 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> @@ -35,7 +35,6 @@
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndCopyFiles(
> IN CONST EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> @@ -58,7 +57,6 @@ ValidateAndCopyFiles(
> @retval SHELL_SUCCESS The source file was copied to the destination
> **/
> SHELL_STATUS
> -EFIAPI
> CopySingleFile(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Dest,
> @@ -291,7 +289,6 @@ CopySingleFile(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndCopyFiles(
> IN CONST EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> @@ -576,7 +573,6 @@ ValidateAndCopyFiles(
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> ProcessValidateAndCopyFiles(
> IN EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> index ff7c818..322d510 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> @@ -28,7 +28,6 @@
>
> **/
> EFI_STATUS
> -EFIAPI
> ConnectAllEfi (
> VOID
> )
> @@ -74,7 +73,6 @@ ConnectAllEfi (
> @retval EFI_OUT_OF_RESOURCES there was insufficient memory **/
> EFI_STATUS -EFIAPI LoadDriver(
> IN CONST CHAR16 *FileName,
> IN CONST BOOLEAN Connect
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> index 9b4c452..52ae18f 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> @@ -22,7 +22,6 @@
> @param[in] TheList a list of files from the volume.
> **/
> EFI_STATUS
> -EFIAPI
> PrintSfoVolumeInfoTableEntry(
> IN CONST EFI_SHELL_FILE_INFO *TheList
> )
> @@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
>
> **/
> VOID
> -EFIAPI
> PrintFileInformation(
> IN CONST BOOLEAN Sfo,
> IN CONST EFI_SHELL_FILE_INFO *TheNode, @@ -263,7 +261,6 @@
> PrintFileInformation(
> @param[in] Path String with starting path.
> **/
> VOID
> -EFIAPI
> PrintNonSfoHeader(
> IN CONST CHAR16 *Path
> )
> @@ -300,7 +297,6 @@ PrintNonSfoHeader(
> @param[in] Dirs The number of directories.
> **/
> VOID
> -EFIAPI
> PrintNonSfoFooter(
> IN UINT64 Files,
> IN UINT64 Size,
> @@ -339,7 +335,6 @@ PrintNonSfoFooter(
> @retval SHELL_SUCCESS the printing was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> PrintLsOutput(
> IN CONST BOOLEAN Rec,
> IN CONST UINT64 Attribs,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> index 035aff1..20eb528 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> @@ -34,7 +34,6 @@
> @retval FALSE String has at least one other character.
> **/
> BOOLEAN
> -EFIAPI
> IsNumberLetterOnly(
> IN CONST CHAR16 *String,
> IN CONST UINTN Len
> @@ -65,7 +64,6 @@ IsNumberLetterOnly(
> items (";" normally).
> **/
> BOOLEAN
> -EFIAPI
> SearchList(
> IN CONST CHAR16 *List,
> IN CONST CHAR16 *MetaTarget,
> @@ -133,7 +131,6 @@ SearchList(
> @retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
> **/
> CHAR16*
> -EFIAPI
> GetDeviceMediaType (
> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
> )
> @@ -179,7 +176,6 @@ GetDeviceMediaType (
> @retval FALSE The handle does not have removable storage.
> **/
> BOOLEAN
> -EFIAPI
> IsRemoveableDevice (
> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
> )
> @@ -216,7 +212,6 @@ IsRemoveableDevice (
> @retval FALSE The map should not be displayed.
> **/
> BOOLEAN
> -EFIAPI
> MappingListHasType(
> IN CONST CHAR16 *MapList,
> IN CONST CHAR16 *Specific,
> @@ -287,7 +282,6 @@ MappingListHasType(
> @retval EFI_SUCCESS The mapping was displayed.
> **/
> EFI_STATUS
> -EFIAPI
> PerformSingleMappingDisplay(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
> @retval EFI_NOT_FOUND Name was not a map on Handle.
> **/
> EFI_STATUS
> -EFIAPI
> PerformSingleMappingDelete(
> IN CONST CHAR16 *Specific,
> IN CONST EFI_HANDLE Handle
> @@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
>
> **/
> SHELL_STATUS
> -EFIAPI
> PerformMappingDisplay(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -690,7 +682,6 @@ PerformMappingDisplay(
> @sa PerformMappingDisplay
> **/
> SHELL_STATUS
> -EFIAPI
> PerformMappingDisplay2(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -743,7 +734,6 @@ PerformMappingDisplay2(
> @retval EFI_NOT_FOUND Specific could not be found.
> **/
> EFI_STATUS
> -EFIAPI
> PerformMappingDelete(
> IN CONST CHAR16 *Specific
> )
> @@ -874,7 +864,6 @@ PerformMappingDelete(
>
> **/
> SHELL_STATUS
> -EFIAPI
> AddMappingFromMapping(
> IN CONST CHAR16 *Map,
> IN CONST CHAR16 *SName
> @@ -931,7 +920,6 @@ AddMappingFromMapping(
>
> **/
> SHELL_STATUS
> -EFIAPI
> AddMappingFromHandle(
> IN CONST EFI_HANDLE Handle,
> IN CONST CHAR16 *SName
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> index f93772c..efaaeb2 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> @@ -26,7 +26,6 @@
> @retval FALSE The move is within a file system.
> **/
> BOOLEAN
> -EFIAPI
> IsBetweenFileSystem(
> IN CONST CHAR16 *FullName,
> IN CONST CHAR16 *Cwd,
> @@ -79,7 +78,6 @@ IsBetweenFileSystem(
> @retval FALSE The move is not
> **/
> BOOLEAN
> -EFIAPI
> IsValidMove(
> IN CONST CHAR16 *SourcePath,
> IN CONST CHAR16 *Cwd,
> @@ -161,7 +159,6 @@ IsValidMove(
> @retval SHELL_SUCCESS The operation was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> GetDestinationLocation(
> IN CONST CHAR16 *DestParameter,
> IN OUT CHAR16 **DestPathPointer,
> @@ -286,7 +283,6 @@ GetDestinationLocation(
> @retval SHELL_SUCCESS The source file was moved to the destination.
> **/
> EFI_STATUS
> -EFIAPI
> MoveBetweenFileSystems(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST CHAR16 *DestPath,
> @@ -334,7 +330,6 @@ MoveBetweenFileSystems(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> EFI_STATUS
> -EFIAPI
> CreateFullDestPath(
> IN CONST CHAR16 **DestPath,
> OUT CHAR16 **FullDestPath,
> @@ -373,7 +368,6 @@ CreateFullDestPath(
> @retval SHELL_OUT_OF_RESOURCES A memory allocation failed.
> **/
> EFI_STATUS
> -EFIAPI
> MoveWithinFileSystems(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CHAR16 *DestPath,
> @@ -454,7 +448,6 @@ MoveWithinFileSystems(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndMoveFiles(
> IN EFI_SHELL_FILE_INFO *FileList,
> OUT VOID **Resp,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> index 12fe877..4b1973a 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> @@ -78,7 +78,6 @@ IsStdInDataAvailable (
> Size was updated to the minimum space required.
> **/
> EFI_STATUS
> -EFIAPI
> ShellFileHandleReadStdInLine(
> IN SHELL_FILE_HANDLE Handle,
> IN OUT CHAR16 *Buffer,
> @@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
> @sa ShellFileHandleReadLine
> **/
> CHAR16*
> -EFIAPI
> ParseReturnStdInLine (
> IN SHELL_FILE_HANDLE Handle
> )
> @@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> PerformParsing(
> IN CONST CHAR16 *FileName,
> IN CONST CHAR16 *TableName,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> index 0b23fba..618610d 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> @@ -29,7 +29,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
> @retval FALSE The directory has at least 1 file or directory in it.
> **/
> BOOLEAN
> -EFIAPI
> IsDirectoryEmpty (
> IN EFI_HANDLE FileHandle
> )
> @@ -66,7 +65,6 @@ IsDirectoryEmpty (
> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
> **/
> SHELL_STATUS
> -EFIAPI
> CascadeDelete(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST BOOLEAN Quiet
> @@ -195,7 +193,6 @@ CascadeDelete(
> @param[in] Package RESERVED. Not used.
> **/
> BOOLEAN
> -EFIAPI
> IsValidDeleteTarget(
> IN CONST EFI_SHELL_FILE_INFO *List,
> IN CONST EFI_SHELL_FILE_INFO *Node,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> index d5e6a08..7ca1942 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> @@ -24,7 +24,6 @@
> @return any return code from GetNextVariableName except
> EFI_NOT_FOUND **/ SHELL_STATUS -EFIAPI PrintAllShellEnvVars(
> VOID
> )
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> index 533519d..3ebc72a 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> @@ -28,7 +28,6 @@
> @retval FALSE String is invalid.
> **/
> BOOLEAN
> -EFIAPI
> InternalIsTimeLikeString (
> IN CONST CHAR16 *String,
> IN CONST CHAR16 Char,
> @@ -87,7 +86,6 @@ InternalIsTimeLikeString (
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetDate (
> IN CONST CHAR16 *DateString
> )
> @@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[]
> = {
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetTime (
> IN CONST CHAR16 *TimeString,
> IN CONST INT16 Tz,
> @@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM
> TimeZoneParamList3[] = {
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetTimeZone (
> IN CONST CHAR16 *TimeZoneString
> )
> diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> index 0dafb19..1491ee9 100644
> ---
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> +++
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
> +++ sLib.c
> @@ -169,7 +169,6 @@ ShellLevel2CommandsLibDestructor (
> @retval other An allocated pointer to a fuly qualified path.
> **/
> CHAR16*
> -EFIAPI
> GetFullyQualifiedPath(
> IN CONST CHAR16* Path
> )
> @@ -216,7 +215,6 @@ GetFullyQualifiedPath(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> VerifyIntermediateDirectories (
> IN CONST CHAR16 *Path
> )
> @@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
> @return Char as an upper case character.
> **/
> CHAR16
> -EFIAPI
> InternalCharToUpper (
> IN CONST CHAR16 Char
> );
> @@ -286,7 +283,6 @@ InternalCharToUpper (
> @return The location in Source where there is a difference.
> **/
> CONST CHAR16*
> -EFIAPI
> StrniCmp(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Target,
> @@ -322,7 +318,6 @@ StrniCmp(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> ShellLevel2StripQuotes (
> IN CONST CHAR16 *OriginalString,
> OUT CHAR16 **CleanString
> diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> index 634515e..19e46a1 100644
> ---
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> +++
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
> +++ sLib.h
> @@ -263,7 +263,6 @@ ShellCommandRunMv (
> @retval other pointer to a fuly qualified path.
> **/
> CHAR16*
> -EFIAPI
> GetFullyQualifiedPath(
> IN CONST CHAR16* Path
> );
> @@ -276,7 +275,6 @@ GetFullyQualifiedPath(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> VerifyIntermediateDirectories (
> IN CONST CHAR16 *Path
> );
> @@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
> @return non-zero if the strings are different.
> **/
> CONST CHAR16*
> -EFIAPI
> StrniCmp(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Target,
> @@ -310,7 +307,6 @@ StrniCmp(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> ShellLevel2StripQuotes (
> IN CONST CHAR16 *OriginalString,
> OUT CHAR16 **CleanString
> @@ -343,7 +339,6 @@ ShellCommandRunVol (
> @retval SHELL_SUCCESS The source file was copied to the destination
> **/
> SHELL_STATUS
> -EFIAPI
> CopySingleFile(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Dest,
> @@ -364,7 +359,6 @@ CopySingleFile(
> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
> **/
> SHELL_STATUS
> -EFIAPI
> CascadeDelete(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST BOOLEAN Quiet
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> index a6f0296..f911c7e 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> @@ -27,7 +27,6 @@
> @retval SHELL_SUCCESS The operation was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> HandleVol(
> IN CONST CHAR16 *Path,
> IN CONST BOOLEAN Delete,
> --
> 2.9.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
2017-08-07 5:56 ` Ni, Ruiyu
@ 2017-08-07 17:01 ` Palmer, Thomas
2017-08-09 23:39 ` Palmer, Thomas
1 sibling, 0 replies; 21+ messages in thread
From: Palmer, Thomas @ 2017-08-07 17:01 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org, Kinney, Michael D
Ruiyu,
I personally do not have a preference whether it has EFIAPI or not. But the declaration must be consistent with the implementation. When this function is not declared correctly, then the shell "cp" command does not work on GCC DEBUG builds. EFIAPI does carry weight in GCC and even CLANG/LLVM builds so consistency is important.
Does this have to remain an internal function? We could avoid this issue entirely if it were in a public header. It seems quite unusual for the EDK2 source to refer to a function in this manner.
Regards,
Thomas Palmer
"I have only made this letter longer because I have not had the time to make it shorter" - Blaise Pascal
-----Original Message-----
From: Ni, Ruiyu [mailto:ruiyu.ni@intel.com]
Sent: Monday, August 7, 2017 12:57 AM
To: Palmer, Thomas <thomas.palmer@hpe.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
Because an internal function doesn't need to have EFIAPI prefix.
I think a proper fix is to change both BaseLib and UefiShellLevel2CommandsLib to add prefix to the function name.
e.g.: ShellLevel2CommandsLibCharToUpper, BaseLibCharToUpper.
And I am also surprised that BaseLib's version also has the EFIAPI prefix.
---BaseLib/String.c---
CHAR16
EFIAPI
InternalCharToUpper (
IN CHAR16 Char
)
Copying Mike for comments.
Thanks/Ray
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Palmer, Thomas
> Sent: Friday, August 4, 2017 3:07 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Subject: Re: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
> Remove unnecessary EFIAPI
>
> Ruiyu,
> Sorry for replying to old patch, I was cleaning out some old
> sandboxes when I stumbled onto this issue.
>
> Why is EFIAPI removed from InternalCharToUpper in
> UefiShellLevel2CommandsLib.c? It is present in both BaseLibInternals.h and
> String.c. Without EFIAPI, GCC builds of this function can fail
>
>
> Regards,
>
> Thomas Palmer
>
> "I have only made this letter longer because I have not had the time
> to make it shorter" - Blaise Pascal
>
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Friday, September 30, 2016 3:18 AM
> To: edk2-devel@lists.01.org
> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>; Jaben Carsey
> <jaben.carsey@intel.com>; Chen A Chen <chen.a.chen@intel.com>
> Subject: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
> Remove unnecessary EFIAPI
>
> From: Ruiyu Ni <Ruiyu.ni@intel.com>
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
> ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 ----
> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 -----
> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 -------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c | 3 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
> ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 ----
> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c | 5 -----
> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h | 6 ------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
> 12 files changed, 53 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> index eb1f3b6..b8f6d31 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> @@ -35,7 +35,6 @@
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndCopyFiles(
> IN CONST EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> @@ -58,7 +57,6 @@ ValidateAndCopyFiles(
> @retval SHELL_SUCCESS The source file was copied to the destination
> **/
> SHELL_STATUS
> -EFIAPI
> CopySingleFile(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Dest,
> @@ -291,7 +289,6 @@ CopySingleFile(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndCopyFiles(
> IN CONST EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> @@ -576,7 +573,6 @@ ValidateAndCopyFiles(
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> ProcessValidateAndCopyFiles(
> IN EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> index ff7c818..322d510 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> @@ -28,7 +28,6 @@
>
> **/
> EFI_STATUS
> -EFIAPI
> ConnectAllEfi (
> VOID
> )
> @@ -74,7 +73,6 @@ ConnectAllEfi (
> @retval EFI_OUT_OF_RESOURCES there was insufficient memory **/
> EFI_STATUS -EFIAPI LoadDriver(
> IN CONST CHAR16 *FileName,
> IN CONST BOOLEAN Connect
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> index 9b4c452..52ae18f 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> @@ -22,7 +22,6 @@
> @param[in] TheList a list of files from the volume.
> **/
> EFI_STATUS
> -EFIAPI
> PrintSfoVolumeInfoTableEntry(
> IN CONST EFI_SHELL_FILE_INFO *TheList
> )
> @@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
>
> **/
> VOID
> -EFIAPI
> PrintFileInformation(
> IN CONST BOOLEAN Sfo,
> IN CONST EFI_SHELL_FILE_INFO *TheNode, @@ -263,7 +261,6 @@
> PrintFileInformation(
> @param[in] Path String with starting path.
> **/
> VOID
> -EFIAPI
> PrintNonSfoHeader(
> IN CONST CHAR16 *Path
> )
> @@ -300,7 +297,6 @@ PrintNonSfoHeader(
> @param[in] Dirs The number of directories.
> **/
> VOID
> -EFIAPI
> PrintNonSfoFooter(
> IN UINT64 Files,
> IN UINT64 Size,
> @@ -339,7 +335,6 @@ PrintNonSfoFooter(
> @retval SHELL_SUCCESS the printing was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> PrintLsOutput(
> IN CONST BOOLEAN Rec,
> IN CONST UINT64 Attribs,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> index 035aff1..20eb528 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> @@ -34,7 +34,6 @@
> @retval FALSE String has at least one other character.
> **/
> BOOLEAN
> -EFIAPI
> IsNumberLetterOnly(
> IN CONST CHAR16 *String,
> IN CONST UINTN Len
> @@ -65,7 +64,6 @@ IsNumberLetterOnly(
> items (";" normally).
> **/
> BOOLEAN
> -EFIAPI
> SearchList(
> IN CONST CHAR16 *List,
> IN CONST CHAR16 *MetaTarget,
> @@ -133,7 +131,6 @@ SearchList(
> @retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
> **/
> CHAR16*
> -EFIAPI
> GetDeviceMediaType (
> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
> )
> @@ -179,7 +176,6 @@ GetDeviceMediaType (
> @retval FALSE The handle does not have removable storage.
> **/
> BOOLEAN
> -EFIAPI
> IsRemoveableDevice (
> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
> )
> @@ -216,7 +212,6 @@ IsRemoveableDevice (
> @retval FALSE The map should not be displayed.
> **/
> BOOLEAN
> -EFIAPI
> MappingListHasType(
> IN CONST CHAR16 *MapList,
> IN CONST CHAR16 *Specific,
> @@ -287,7 +282,6 @@ MappingListHasType(
> @retval EFI_SUCCESS The mapping was displayed.
> **/
> EFI_STATUS
> -EFIAPI
> PerformSingleMappingDisplay(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
> @retval EFI_NOT_FOUND Name was not a map on Handle.
> **/
> EFI_STATUS
> -EFIAPI
> PerformSingleMappingDelete(
> IN CONST CHAR16 *Specific,
> IN CONST EFI_HANDLE Handle
> @@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
>
> **/
> SHELL_STATUS
> -EFIAPI
> PerformMappingDisplay(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -690,7 +682,6 @@ PerformMappingDisplay(
> @sa PerformMappingDisplay
> **/
> SHELL_STATUS
> -EFIAPI
> PerformMappingDisplay2(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -743,7 +734,6 @@ PerformMappingDisplay2(
> @retval EFI_NOT_FOUND Specific could not be found.
> **/
> EFI_STATUS
> -EFIAPI
> PerformMappingDelete(
> IN CONST CHAR16 *Specific
> )
> @@ -874,7 +864,6 @@ PerformMappingDelete(
>
> **/
> SHELL_STATUS
> -EFIAPI
> AddMappingFromMapping(
> IN CONST CHAR16 *Map,
> IN CONST CHAR16 *SName
> @@ -931,7 +920,6 @@ AddMappingFromMapping(
>
> **/
> SHELL_STATUS
> -EFIAPI
> AddMappingFromHandle(
> IN CONST EFI_HANDLE Handle,
> IN CONST CHAR16 *SName
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> index f93772c..efaaeb2 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> @@ -26,7 +26,6 @@
> @retval FALSE The move is within a file system.
> **/
> BOOLEAN
> -EFIAPI
> IsBetweenFileSystem(
> IN CONST CHAR16 *FullName,
> IN CONST CHAR16 *Cwd,
> @@ -79,7 +78,6 @@ IsBetweenFileSystem(
> @retval FALSE The move is not
> **/
> BOOLEAN
> -EFIAPI
> IsValidMove(
> IN CONST CHAR16 *SourcePath,
> IN CONST CHAR16 *Cwd,
> @@ -161,7 +159,6 @@ IsValidMove(
> @retval SHELL_SUCCESS The operation was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> GetDestinationLocation(
> IN CONST CHAR16 *DestParameter,
> IN OUT CHAR16 **DestPathPointer,
> @@ -286,7 +283,6 @@ GetDestinationLocation(
> @retval SHELL_SUCCESS The source file was moved to the destination.
> **/
> EFI_STATUS
> -EFIAPI
> MoveBetweenFileSystems(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST CHAR16 *DestPath,
> @@ -334,7 +330,6 @@ MoveBetweenFileSystems(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> EFI_STATUS
> -EFIAPI
> CreateFullDestPath(
> IN CONST CHAR16 **DestPath,
> OUT CHAR16 **FullDestPath,
> @@ -373,7 +368,6 @@ CreateFullDestPath(
> @retval SHELL_OUT_OF_RESOURCES A memory allocation failed.
> **/
> EFI_STATUS
> -EFIAPI
> MoveWithinFileSystems(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CHAR16 *DestPath,
> @@ -454,7 +448,6 @@ MoveWithinFileSystems(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndMoveFiles(
> IN EFI_SHELL_FILE_INFO *FileList,
> OUT VOID **Resp,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> index 12fe877..4b1973a 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> @@ -78,7 +78,6 @@ IsStdInDataAvailable (
> Size was updated to the minimum space required.
> **/
> EFI_STATUS
> -EFIAPI
> ShellFileHandleReadStdInLine(
> IN SHELL_FILE_HANDLE Handle,
> IN OUT CHAR16 *Buffer,
> @@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
> @sa ShellFileHandleReadLine
> **/
> CHAR16*
> -EFIAPI
> ParseReturnStdInLine (
> IN SHELL_FILE_HANDLE Handle
> )
> @@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> PerformParsing(
> IN CONST CHAR16 *FileName,
> IN CONST CHAR16 *TableName,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> index 0b23fba..618610d 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> @@ -29,7 +29,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
> @retval FALSE The directory has at least 1 file or directory in it.
> **/
> BOOLEAN
> -EFIAPI
> IsDirectoryEmpty (
> IN EFI_HANDLE FileHandle
> )
> @@ -66,7 +65,6 @@ IsDirectoryEmpty (
> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
> **/
> SHELL_STATUS
> -EFIAPI
> CascadeDelete(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST BOOLEAN Quiet
> @@ -195,7 +193,6 @@ CascadeDelete(
> @param[in] Package RESERVED. Not used.
> **/
> BOOLEAN
> -EFIAPI
> IsValidDeleteTarget(
> IN CONST EFI_SHELL_FILE_INFO *List,
> IN CONST EFI_SHELL_FILE_INFO *Node, diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> index d5e6a08..7ca1942 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> @@ -24,7 +24,6 @@
> @return any return code from GetNextVariableName except
> EFI_NOT_FOUND **/ SHELL_STATUS -EFIAPI PrintAllShellEnvVars(
> VOID
> )
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> index 533519d..3ebc72a 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> @@ -28,7 +28,6 @@
> @retval FALSE String is invalid.
> **/
> BOOLEAN
> -EFIAPI
> InternalIsTimeLikeString (
> IN CONST CHAR16 *String,
> IN CONST CHAR16 Char,
> @@ -87,7 +86,6 @@ InternalIsTimeLikeString (
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetDate (
> IN CONST CHAR16 *DateString
> )
> @@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetTime (
> IN CONST CHAR16 *TimeString,
> IN CONST INT16 Tz,
> @@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeZoneParamList3[]
> = {
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetTimeZone (
> IN CONST CHAR16 *TimeZoneString
> )
> diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> index 0dafb19..1491ee9 100644
> ---
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> +++
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
> +++ sLib.c
> @@ -169,7 +169,6 @@ ShellLevel2CommandsLibDestructor (
> @retval other An allocated pointer to a fuly qualified path.
> **/
> CHAR16*
> -EFIAPI
> GetFullyQualifiedPath(
> IN CONST CHAR16* Path
> )
> @@ -216,7 +215,6 @@ GetFullyQualifiedPath(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> VerifyIntermediateDirectories (
> IN CONST CHAR16 *Path
> )
> @@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
> @return Char as an upper case character.
> **/
> CHAR16
> -EFIAPI
> InternalCharToUpper (
> IN CONST CHAR16 Char
> );
> @@ -286,7 +283,6 @@ InternalCharToUpper (
> @return The location in Source where there is a difference.
> **/
> CONST CHAR16*
> -EFIAPI
> StrniCmp(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Target,
> @@ -322,7 +318,6 @@ StrniCmp(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> ShellLevel2StripQuotes (
> IN CONST CHAR16 *OriginalString,
> OUT CHAR16 **CleanString
> diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> index 634515e..19e46a1 100644
> ---
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> +++
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
> +++ sLib.h
> @@ -263,7 +263,6 @@ ShellCommandRunMv (
> @retval other pointer to a fuly qualified path.
> **/
> CHAR16*
> -EFIAPI
> GetFullyQualifiedPath(
> IN CONST CHAR16* Path
> );
> @@ -276,7 +275,6 @@ GetFullyQualifiedPath(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> VerifyIntermediateDirectories (
> IN CONST CHAR16 *Path
> );
> @@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
> @return non-zero if the strings are different.
> **/
> CONST CHAR16*
> -EFIAPI
> StrniCmp(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Target,
> @@ -310,7 +307,6 @@ StrniCmp(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> ShellLevel2StripQuotes (
> IN CONST CHAR16 *OriginalString,
> OUT CHAR16 **CleanString
> @@ -343,7 +339,6 @@ ShellCommandRunVol (
> @retval SHELL_SUCCESS The source file was copied to the destination
> **/
> SHELL_STATUS
> -EFIAPI
> CopySingleFile(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Dest,
> @@ -364,7 +359,6 @@ CopySingleFile(
> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
> **/
> SHELL_STATUS
> -EFIAPI
> CascadeDelete(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST BOOLEAN Quiet
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> index a6f0296..f911c7e 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> @@ -27,7 +27,6 @@
> @retval SHELL_SUCCESS The operation was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> HandleVol(
> IN CONST CHAR16 *Path,
> IN CONST BOOLEAN Delete,
> --
> 2.9.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
2017-08-07 5:56 ` Ni, Ruiyu
2017-08-07 17:01 ` Palmer, Thomas
@ 2017-08-09 23:39 ` Palmer, Thomas
2017-08-10 0:41 ` Ni, Ruiyu
1 sibling, 1 reply; 21+ messages in thread
From: Palmer, Thomas @ 2017-08-09 23:39 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org, Kinney, Michael D
Ruiyu,
Will you put out the appropriate patch or should I?
Regards,
Thomas Palmer
"I have only made this letter longer because I have not had the time to make it shorter" - Blaise Pascal
-----Original Message-----
From: Ni, Ruiyu [mailto:ruiyu.ni@intel.com]
Sent: Monday, August 7, 2017 12:57 AM
To: Palmer, Thomas <thomas.palmer@hpe.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
Because an internal function doesn't need to have EFIAPI prefix.
I think a proper fix is to change both BaseLib and UefiShellLevel2CommandsLib to add prefix to the function name.
e.g.: ShellLevel2CommandsLibCharToUpper, BaseLibCharToUpper.
And I am also surprised that BaseLib's version also has the EFIAPI prefix.
---BaseLib/String.c---
CHAR16
EFIAPI
InternalCharToUpper (
IN CHAR16 Char
)
Copying Mike for comments.
Thanks/Ray
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Palmer, Thomas
> Sent: Friday, August 4, 2017 3:07 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Subject: Re: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
> Remove unnecessary EFIAPI
>
> Ruiyu,
> Sorry for replying to old patch, I was cleaning out some old
> sandboxes when I stumbled onto this issue.
>
> Why is EFIAPI removed from InternalCharToUpper in
> UefiShellLevel2CommandsLib.c? It is present in both BaseLibInternals.h and
> String.c. Without EFIAPI, GCC builds of this function can fail
>
>
> Regards,
>
> Thomas Palmer
>
> "I have only made this letter longer because I have not had the time
> to make it shorter" - Blaise Pascal
>
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Friday, September 30, 2016 3:18 AM
> To: edk2-devel@lists.01.org
> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>; Jaben Carsey
> <jaben.carsey@intel.com>; Chen A Chen <chen.a.chen@intel.com>
> Subject: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
> Remove unnecessary EFIAPI
>
> From: Ruiyu Ni <Ruiyu.ni@intel.com>
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
> ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 ----
> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 -----
> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 -------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c | 3 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
> ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 ----
> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c | 5 -----
> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h | 6 ------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
> 12 files changed, 53 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> index eb1f3b6..b8f6d31 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
> @@ -35,7 +35,6 @@
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndCopyFiles(
> IN CONST EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> @@ -58,7 +57,6 @@ ValidateAndCopyFiles(
> @retval SHELL_SUCCESS The source file was copied to the destination
> **/
> SHELL_STATUS
> -EFIAPI
> CopySingleFile(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Dest,
> @@ -291,7 +289,6 @@ CopySingleFile(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndCopyFiles(
> IN CONST EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> @@ -576,7 +573,6 @@ ValidateAndCopyFiles(
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> ProcessValidateAndCopyFiles(
> IN EFI_SHELL_FILE_INFO *FileList,
> IN CONST CHAR16 *DestDir,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> index ff7c818..322d510 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
> @@ -28,7 +28,6 @@
>
> **/
> EFI_STATUS
> -EFIAPI
> ConnectAllEfi (
> VOID
> )
> @@ -74,7 +73,6 @@ ConnectAllEfi (
> @retval EFI_OUT_OF_RESOURCES there was insufficient memory **/
> EFI_STATUS -EFIAPI LoadDriver(
> IN CONST CHAR16 *FileName,
> IN CONST BOOLEAN Connect
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> index 9b4c452..52ae18f 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
> @@ -22,7 +22,6 @@
> @param[in] TheList a list of files from the volume.
> **/
> EFI_STATUS
> -EFIAPI
> PrintSfoVolumeInfoTableEntry(
> IN CONST EFI_SHELL_FILE_INFO *TheList
> )
> @@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
>
> **/
> VOID
> -EFIAPI
> PrintFileInformation(
> IN CONST BOOLEAN Sfo,
> IN CONST EFI_SHELL_FILE_INFO *TheNode, @@ -263,7 +261,6 @@
> PrintFileInformation(
> @param[in] Path String with starting path.
> **/
> VOID
> -EFIAPI
> PrintNonSfoHeader(
> IN CONST CHAR16 *Path
> )
> @@ -300,7 +297,6 @@ PrintNonSfoHeader(
> @param[in] Dirs The number of directories.
> **/
> VOID
> -EFIAPI
> PrintNonSfoFooter(
> IN UINT64 Files,
> IN UINT64 Size,
> @@ -339,7 +335,6 @@ PrintNonSfoFooter(
> @retval SHELL_SUCCESS the printing was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> PrintLsOutput(
> IN CONST BOOLEAN Rec,
> IN CONST UINT64 Attribs,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> index 035aff1..20eb528 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
> @@ -34,7 +34,6 @@
> @retval FALSE String has at least one other character.
> **/
> BOOLEAN
> -EFIAPI
> IsNumberLetterOnly(
> IN CONST CHAR16 *String,
> IN CONST UINTN Len
> @@ -65,7 +64,6 @@ IsNumberLetterOnly(
> items (";" normally).
> **/
> BOOLEAN
> -EFIAPI
> SearchList(
> IN CONST CHAR16 *List,
> IN CONST CHAR16 *MetaTarget,
> @@ -133,7 +131,6 @@ SearchList(
> @retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
> **/
> CHAR16*
> -EFIAPI
> GetDeviceMediaType (
> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
> )
> @@ -179,7 +176,6 @@ GetDeviceMediaType (
> @retval FALSE The handle does not have removable storage.
> **/
> BOOLEAN
> -EFIAPI
> IsRemoveableDevice (
> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
> )
> @@ -216,7 +212,6 @@ IsRemoveableDevice (
> @retval FALSE The map should not be displayed.
> **/
> BOOLEAN
> -EFIAPI
> MappingListHasType(
> IN CONST CHAR16 *MapList,
> IN CONST CHAR16 *Specific,
> @@ -287,7 +282,6 @@ MappingListHasType(
> @retval EFI_SUCCESS The mapping was displayed.
> **/
> EFI_STATUS
> -EFIAPI
> PerformSingleMappingDisplay(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
> @retval EFI_NOT_FOUND Name was not a map on Handle.
> **/
> EFI_STATUS
> -EFIAPI
> PerformSingleMappingDelete(
> IN CONST CHAR16 *Specific,
> IN CONST EFI_HANDLE Handle
> @@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
>
> **/
> SHELL_STATUS
> -EFIAPI
> PerformMappingDisplay(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -690,7 +682,6 @@ PerformMappingDisplay(
> @sa PerformMappingDisplay
> **/
> SHELL_STATUS
> -EFIAPI
> PerformMappingDisplay2(
> IN CONST BOOLEAN Verbose,
> IN CONST BOOLEAN Consist,
> @@ -743,7 +734,6 @@ PerformMappingDisplay2(
> @retval EFI_NOT_FOUND Specific could not be found.
> **/
> EFI_STATUS
> -EFIAPI
> PerformMappingDelete(
> IN CONST CHAR16 *Specific
> )
> @@ -874,7 +864,6 @@ PerformMappingDelete(
>
> **/
> SHELL_STATUS
> -EFIAPI
> AddMappingFromMapping(
> IN CONST CHAR16 *Map,
> IN CONST CHAR16 *SName
> @@ -931,7 +920,6 @@ AddMappingFromMapping(
>
> **/
> SHELL_STATUS
> -EFIAPI
> AddMappingFromHandle(
> IN CONST EFI_HANDLE Handle,
> IN CONST CHAR16 *SName
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> index f93772c..efaaeb2 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
> @@ -26,7 +26,6 @@
> @retval FALSE The move is within a file system.
> **/
> BOOLEAN
> -EFIAPI
> IsBetweenFileSystem(
> IN CONST CHAR16 *FullName,
> IN CONST CHAR16 *Cwd,
> @@ -79,7 +78,6 @@ IsBetweenFileSystem(
> @retval FALSE The move is not
> **/
> BOOLEAN
> -EFIAPI
> IsValidMove(
> IN CONST CHAR16 *SourcePath,
> IN CONST CHAR16 *Cwd,
> @@ -161,7 +159,6 @@ IsValidMove(
> @retval SHELL_SUCCESS The operation was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> GetDestinationLocation(
> IN CONST CHAR16 *DestParameter,
> IN OUT CHAR16 **DestPathPointer,
> @@ -286,7 +283,6 @@ GetDestinationLocation(
> @retval SHELL_SUCCESS The source file was moved to the destination.
> **/
> EFI_STATUS
> -EFIAPI
> MoveBetweenFileSystems(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST CHAR16 *DestPath,
> @@ -334,7 +330,6 @@ MoveBetweenFileSystems(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> EFI_STATUS
> -EFIAPI
> CreateFullDestPath(
> IN CONST CHAR16 **DestPath,
> OUT CHAR16 **FullDestPath,
> @@ -373,7 +368,6 @@ CreateFullDestPath(
> @retval SHELL_OUT_OF_RESOURCES A memory allocation failed.
> **/
> EFI_STATUS
> -EFIAPI
> MoveWithinFileSystems(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CHAR16 *DestPath,
> @@ -454,7 +448,6 @@ MoveWithinFileSystems(
> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
> **/
> SHELL_STATUS
> -EFIAPI
> ValidateAndMoveFiles(
> IN EFI_SHELL_FILE_INFO *FileList,
> OUT VOID **Resp,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> index 12fe877..4b1973a 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
> @@ -78,7 +78,6 @@ IsStdInDataAvailable (
> Size was updated to the minimum space required.
> **/
> EFI_STATUS
> -EFIAPI
> ShellFileHandleReadStdInLine(
> IN SHELL_FILE_HANDLE Handle,
> IN OUT CHAR16 *Buffer,
> @@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
> @sa ShellFileHandleReadLine
> **/
> CHAR16*
> -EFIAPI
> ParseReturnStdInLine (
> IN SHELL_FILE_HANDLE Handle
> )
> @@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> PerformParsing(
> IN CONST CHAR16 *FileName,
> IN CONST CHAR16 *TableName,
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> index 0b23fba..618610d 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> @@ -29,7 +29,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
> @retval FALSE The directory has at least 1 file or directory in it.
> **/
> BOOLEAN
> -EFIAPI
> IsDirectoryEmpty (
> IN EFI_HANDLE FileHandle
> )
> @@ -66,7 +65,6 @@ IsDirectoryEmpty (
> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
> **/
> SHELL_STATUS
> -EFIAPI
> CascadeDelete(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST BOOLEAN Quiet
> @@ -195,7 +193,6 @@ CascadeDelete(
> @param[in] Package RESERVED. Not used.
> **/
> BOOLEAN
> -EFIAPI
> IsValidDeleteTarget(
> IN CONST EFI_SHELL_FILE_INFO *List,
> IN CONST EFI_SHELL_FILE_INFO *Node, diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> index d5e6a08..7ca1942 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
> @@ -24,7 +24,6 @@
> @return any return code from GetNextVariableName except
> EFI_NOT_FOUND **/ SHELL_STATUS -EFIAPI PrintAllShellEnvVars(
> VOID
> )
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> index 533519d..3ebc72a 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
> @@ -28,7 +28,6 @@
> @retval FALSE String is invalid.
> **/
> BOOLEAN
> -EFIAPI
> InternalIsTimeLikeString (
> IN CONST CHAR16 *String,
> IN CONST CHAR16 Char,
> @@ -87,7 +86,6 @@ InternalIsTimeLikeString (
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetDate (
> IN CONST CHAR16 *DateString
> )
> @@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetTime (
> IN CONST CHAR16 *TimeString,
> IN CONST INT16 Tz,
> @@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeZoneParamList3[]
> = {
> @retval SHELL_SUCCESS The operation was successful.
> **/
> SHELL_STATUS
> -EFIAPI
> CheckAndSetTimeZone (
> IN CONST CHAR16 *TimeZoneString
> )
> diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> index 0dafb19..1491ee9 100644
> ---
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.c
> +++
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
> +++ sLib.c
> @@ -169,7 +169,6 @@ ShellLevel2CommandsLibDestructor (
> @retval other An allocated pointer to a fuly qualified path.
> **/
> CHAR16*
> -EFIAPI
> GetFullyQualifiedPath(
> IN CONST CHAR16* Path
> )
> @@ -216,7 +215,6 @@ GetFullyQualifiedPath(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> VerifyIntermediateDirectories (
> IN CONST CHAR16 *Path
> )
> @@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
> @return Char as an upper case character.
> **/
> CHAR16
> -EFIAPI
> InternalCharToUpper (
> IN CONST CHAR16 Char
> );
> @@ -286,7 +283,6 @@ InternalCharToUpper (
> @return The location in Source where there is a difference.
> **/
> CONST CHAR16*
> -EFIAPI
> StrniCmp(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Target,
> @@ -322,7 +318,6 @@ StrniCmp(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> ShellLevel2StripQuotes (
> IN CONST CHAR16 *OriginalString,
> OUT CHAR16 **CleanString
> diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> index 634515e..19e46a1 100644
> ---
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
> Lib.h
> +++
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
> +++ sLib.h
> @@ -263,7 +263,6 @@ ShellCommandRunMv (
> @retval other pointer to a fuly qualified path.
> **/
> CHAR16*
> -EFIAPI
> GetFullyQualifiedPath(
> IN CONST CHAR16* Path
> );
> @@ -276,7 +275,6 @@ GetFullyQualifiedPath(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> VerifyIntermediateDirectories (
> IN CONST CHAR16 *Path
> );
> @@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
> @return non-zero if the strings are different.
> **/
> CONST CHAR16*
> -EFIAPI
> StrniCmp(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Target,
> @@ -310,7 +307,6 @@ StrniCmp(
> @retval EFI_SUCCESS The operation was successful.
> **/
> EFI_STATUS
> -EFIAPI
> ShellLevel2StripQuotes (
> IN CONST CHAR16 *OriginalString,
> OUT CHAR16 **CleanString
> @@ -343,7 +339,6 @@ ShellCommandRunVol (
> @retval SHELL_SUCCESS The source file was copied to the destination
> **/
> SHELL_STATUS
> -EFIAPI
> CopySingleFile(
> IN CONST CHAR16 *Source,
> IN CONST CHAR16 *Dest,
> @@ -364,7 +359,6 @@ CopySingleFile(
> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
> **/
> SHELL_STATUS
> -EFIAPI
> CascadeDelete(
> IN EFI_SHELL_FILE_INFO *Node,
> IN CONST BOOLEAN Quiet
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> index a6f0296..f911c7e 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
> @@ -27,7 +27,6 @@
> @retval SHELL_SUCCESS The operation was sucessful.
> **/
> SHELL_STATUS
> -EFIAPI
> HandleVol(
> IN CONST CHAR16 *Path,
> IN CONST BOOLEAN Delete,
> --
> 2.9.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
2017-08-09 23:39 ` Palmer, Thomas
@ 2017-08-10 0:41 ` Ni, Ruiyu
2017-08-10 0:59 ` Palmer, Thomas
0 siblings, 1 reply; 21+ messages in thread
From: Ni, Ruiyu @ 2017-08-10 0:41 UTC (permalink / raw)
To: Palmer, Thomas, edk2-devel@lists.01.org, Kinney, Michael D
I've submitted a tracker for this:
https://bugzilla.tianocore.org/show_bug.cgi?id=664
It's in my to-do list. do you need the fix urgent?
Regards,
Ray
>-----Original Message-----
>From: Palmer, Thomas [mailto:thomas.palmer@hpe.com]
>Sent: Thursday, August 10, 2017 7:40 AM
>To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
>Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
>
>Ruiyu,
>
>Will you put out the appropriate patch or should I?
>
>
>Regards,
>
>Thomas Palmer
>
>"I have only made this letter longer because I have not had the time to make it shorter" - Blaise Pascal
>
>-----Original Message-----
>From: Ni, Ruiyu [mailto:ruiyu.ni@intel.com]
>Sent: Monday, August 7, 2017 12:57 AM
>To: Palmer, Thomas <thomas.palmer@hpe.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
>Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
>
>Because an internal function doesn't need to have EFIAPI prefix.
>I think a proper fix is to change both BaseLib and UefiShellLevel2CommandsLib to add prefix to the function name.
>e.g.: ShellLevel2CommandsLibCharToUpper, BaseLibCharToUpper.
>
>And I am also surprised that BaseLib's version also has the EFIAPI prefix.
>---BaseLib/String.c---
> CHAR16
> EFIAPI
> InternalCharToUpper (
> IN CHAR16 Char
> )
>
>Copying Mike for comments.
>
>Thanks/Ray
>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>> Palmer, Thomas
>> Sent: Friday, August 4, 2017 3:07 AM
>> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
>> Subject: Re: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
>> Remove unnecessary EFIAPI
>>
>> Ruiyu,
>> Sorry for replying to old patch, I was cleaning out some old
>> sandboxes when I stumbled onto this issue.
>>
>> Why is EFIAPI removed from InternalCharToUpper in
>> UefiShellLevel2CommandsLib.c? It is present in both BaseLibInternals.h and
>> String.c. Without EFIAPI, GCC builds of this function can fail
>>
>>
>> Regards,
>>
>> Thomas Palmer
>>
>> "I have only made this letter longer because I have not had the time
>> to make it shorter" - Blaise Pascal
>>
>>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>> Ruiyu Ni
>> Sent: Friday, September 30, 2016 3:18 AM
>> To: edk2-devel@lists.01.org
>> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>; Jaben Carsey
>> <jaben.carsey@intel.com>; Chen A Chen <chen.a.chen@intel.com>
>> Subject: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
>> Remove unnecessary EFIAPI
>>
>> From: Ruiyu Ni <Ruiyu.ni@intel.com>
>>
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
>> Cc: Jaben Carsey <jaben.carsey@intel.com>
>> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
>> ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 ----
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 --
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 -----
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------------
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 -------
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c | 3 ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
>> ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 ----
>> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c | 5 -----
>> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h | 6 ------
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
>> 12 files changed, 53 deletions(-)
>>
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> index eb1f3b6..b8f6d31 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> @@ -35,7 +35,6 @@
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ValidateAndCopyFiles(
>> IN CONST EFI_SHELL_FILE_INFO *FileList,
>> IN CONST CHAR16 *DestDir,
>> @@ -58,7 +57,6 @@ ValidateAndCopyFiles(
>> @retval SHELL_SUCCESS The source file was copied to the destination
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CopySingleFile(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Dest,
>> @@ -291,7 +289,6 @@ CopySingleFile(
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ValidateAndCopyFiles(
>> IN CONST EFI_SHELL_FILE_INFO *FileList,
>> IN CONST CHAR16 *DestDir,
>> @@ -576,7 +573,6 @@ ValidateAndCopyFiles(
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ProcessValidateAndCopyFiles(
>> IN EFI_SHELL_FILE_INFO *FileList,
>> IN CONST CHAR16 *DestDir,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> index ff7c818..322d510 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> @@ -28,7 +28,6 @@
>>
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ConnectAllEfi (
>> VOID
>> )
>> @@ -74,7 +73,6 @@ ConnectAllEfi (
>> @retval EFI_OUT_OF_RESOURCES there was insufficient memory **/
>> EFI_STATUS -EFIAPI LoadDriver(
>> IN CONST CHAR16 *FileName,
>> IN CONST BOOLEAN Connect
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> index 9b4c452..52ae18f 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> @@ -22,7 +22,6 @@
>> @param[in] TheList a list of files from the volume.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PrintSfoVolumeInfoTableEntry(
>> IN CONST EFI_SHELL_FILE_INFO *TheList
>> )
>> @@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
>>
>> **/
>> VOID
>> -EFIAPI
>> PrintFileInformation(
>> IN CONST BOOLEAN Sfo,
>> IN CONST EFI_SHELL_FILE_INFO *TheNode, @@ -263,7 +261,6 @@
>> PrintFileInformation(
>> @param[in] Path String with starting path.
>> **/
>> VOID
>> -EFIAPI
>> PrintNonSfoHeader(
>> IN CONST CHAR16 *Path
>> )
>> @@ -300,7 +297,6 @@ PrintNonSfoHeader(
>> @param[in] Dirs The number of directories.
>> **/
>> VOID
>> -EFIAPI
>> PrintNonSfoFooter(
>> IN UINT64 Files,
>> IN UINT64 Size,
>> @@ -339,7 +335,6 @@ PrintNonSfoFooter(
>> @retval SHELL_SUCCESS the printing was sucessful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PrintLsOutput(
>> IN CONST BOOLEAN Rec,
>> IN CONST UINT64 Attribs,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> index 035aff1..20eb528 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> @@ -34,7 +34,6 @@
>> @retval FALSE String has at least one other character.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsNumberLetterOnly(
>> IN CONST CHAR16 *String,
>> IN CONST UINTN Len
>> @@ -65,7 +64,6 @@ IsNumberLetterOnly(
>> items (";" normally).
>> **/
>> BOOLEAN
>> -EFIAPI
>> SearchList(
>> IN CONST CHAR16 *List,
>> IN CONST CHAR16 *MetaTarget,
>> @@ -133,7 +131,6 @@ SearchList(
>> @retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
>> **/
>> CHAR16*
>> -EFIAPI
>> GetDeviceMediaType (
>> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
>> )
>> @@ -179,7 +176,6 @@ GetDeviceMediaType (
>> @retval FALSE The handle does not have removable storage.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsRemoveableDevice (
>> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
>> )
>> @@ -216,7 +212,6 @@ IsRemoveableDevice (
>> @retval FALSE The map should not be displayed.
>> **/
>> BOOLEAN
>> -EFIAPI
>> MappingListHasType(
>> IN CONST CHAR16 *MapList,
>> IN CONST CHAR16 *Specific,
>> @@ -287,7 +282,6 @@ MappingListHasType(
>> @retval EFI_SUCCESS The mapping was displayed.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PerformSingleMappingDisplay(
>> IN CONST BOOLEAN Verbose,
>> IN CONST BOOLEAN Consist,
>> @@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
>> @retval EFI_NOT_FOUND Name was not a map on Handle.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PerformSingleMappingDelete(
>> IN CONST CHAR16 *Specific,
>> IN CONST EFI_HANDLE Handle
>> @@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
>>
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PerformMappingDisplay(
>> IN CONST BOOLEAN Verbose,
>> IN CONST BOOLEAN Consist,
>> @@ -690,7 +682,6 @@ PerformMappingDisplay(
>> @sa PerformMappingDisplay
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PerformMappingDisplay2(
>> IN CONST BOOLEAN Verbose,
>> IN CONST BOOLEAN Consist,
>> @@ -743,7 +734,6 @@ PerformMappingDisplay2(
>> @retval EFI_NOT_FOUND Specific could not be found.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PerformMappingDelete(
>> IN CONST CHAR16 *Specific
>> )
>> @@ -874,7 +864,6 @@ PerformMappingDelete(
>>
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> AddMappingFromMapping(
>> IN CONST CHAR16 *Map,
>> IN CONST CHAR16 *SName
>> @@ -931,7 +920,6 @@ AddMappingFromMapping(
>>
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> AddMappingFromHandle(
>> IN CONST EFI_HANDLE Handle,
>> IN CONST CHAR16 *SName
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> index f93772c..efaaeb2 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> @@ -26,7 +26,6 @@
>> @retval FALSE The move is within a file system.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsBetweenFileSystem(
>> IN CONST CHAR16 *FullName,
>> IN CONST CHAR16 *Cwd,
>> @@ -79,7 +78,6 @@ IsBetweenFileSystem(
>> @retval FALSE The move is not
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsValidMove(
>> IN CONST CHAR16 *SourcePath,
>> IN CONST CHAR16 *Cwd,
>> @@ -161,7 +159,6 @@ IsValidMove(
>> @retval SHELL_SUCCESS The operation was sucessful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> GetDestinationLocation(
>> IN CONST CHAR16 *DestParameter,
>> IN OUT CHAR16 **DestPathPointer,
>> @@ -286,7 +283,6 @@ GetDestinationLocation(
>> @retval SHELL_SUCCESS The source file was moved to the destination.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> MoveBetweenFileSystems(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CONST CHAR16 *DestPath,
>> @@ -334,7 +330,6 @@ MoveBetweenFileSystems(
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> EFI_STATUS
>> -EFIAPI
>> CreateFullDestPath(
>> IN CONST CHAR16 **DestPath,
>> OUT CHAR16 **FullDestPath,
>> @@ -373,7 +368,6 @@ CreateFullDestPath(
>> @retval SHELL_OUT_OF_RESOURCES A memory allocation failed.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> MoveWithinFileSystems(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CHAR16 *DestPath,
>> @@ -454,7 +448,6 @@ MoveWithinFileSystems(
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ValidateAndMoveFiles(
>> IN EFI_SHELL_FILE_INFO *FileList,
>> OUT VOID **Resp,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> index 12fe877..4b1973a 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> @@ -78,7 +78,6 @@ IsStdInDataAvailable (
>> Size was updated to the minimum space required.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ShellFileHandleReadStdInLine(
>> IN SHELL_FILE_HANDLE Handle,
>> IN OUT CHAR16 *Buffer,
>> @@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
>> @sa ShellFileHandleReadLine
>> **/
>> CHAR16*
>> -EFIAPI
>> ParseReturnStdInLine (
>> IN SHELL_FILE_HANDLE Handle
>> )
>> @@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PerformParsing(
>> IN CONST CHAR16 *FileName,
>> IN CONST CHAR16 *TableName,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> index 0b23fba..618610d 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> @@ -29,7 +29,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
>> @retval FALSE The directory has at least 1 file or directory in it.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsDirectoryEmpty (
>> IN EFI_HANDLE FileHandle
>> )
>> @@ -66,7 +65,6 @@ IsDirectoryEmpty (
>> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CascadeDelete(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CONST BOOLEAN Quiet
>> @@ -195,7 +193,6 @@ CascadeDelete(
>> @param[in] Package RESERVED. Not used.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsValidDeleteTarget(
>> IN CONST EFI_SHELL_FILE_INFO *List,
>> IN CONST EFI_SHELL_FILE_INFO *Node, diff --git
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> index d5e6a08..7ca1942 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> @@ -24,7 +24,6 @@
>> @return any return code from GetNextVariableName except
>> EFI_NOT_FOUND **/ SHELL_STATUS -EFIAPI PrintAllShellEnvVars(
>> VOID
>> )
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> index 533519d..3ebc72a 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> @@ -28,7 +28,6 @@
>> @retval FALSE String is invalid.
>> **/
>> BOOLEAN
>> -EFIAPI
>> InternalIsTimeLikeString (
>> IN CONST CHAR16 *String,
>> IN CONST CHAR16 Char,
>> @@ -87,7 +86,6 @@ InternalIsTimeLikeString (
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CheckAndSetDate (
>> IN CONST CHAR16 *DateString
>> )
>> @@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CheckAndSetTime (
>> IN CONST CHAR16 *TimeString,
>> IN CONST INT16 Tz,
>> @@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeZoneParamList3[]
>> = {
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CheckAndSetTimeZone (
>> IN CONST CHAR16 *TimeZoneString
>> )
>> diff --git
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.c
>> index 0dafb19..1491ee9 100644
>> ---
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.c
>> +++
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
>> +++ sLib.c
>> @@ -169,7 +169,6 @@ ShellLevel2CommandsLibDestructor (
>> @retval other An allocated pointer to a fuly qualified path.
>> **/
>> CHAR16*
>> -EFIAPI
>> GetFullyQualifiedPath(
>> IN CONST CHAR16* Path
>> )
>> @@ -216,7 +215,6 @@ GetFullyQualifiedPath(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> VerifyIntermediateDirectories (
>> IN CONST CHAR16 *Path
>> )
>> @@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
>> @return Char as an upper case character.
>> **/
>> CHAR16
>> -EFIAPI
>> InternalCharToUpper (
>> IN CONST CHAR16 Char
>> );
>> @@ -286,7 +283,6 @@ InternalCharToUpper (
>> @return The location in Source where there is a difference.
>> **/
>> CONST CHAR16*
>> -EFIAPI
>> StrniCmp(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Target,
>> @@ -322,7 +318,6 @@ StrniCmp(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ShellLevel2StripQuotes (
>> IN CONST CHAR16 *OriginalString,
>> OUT CHAR16 **CleanString
>> diff --git
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.h
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.h
>> index 634515e..19e46a1 100644
>> ---
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.h
>> +++
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
>> +++ sLib.h
>> @@ -263,7 +263,6 @@ ShellCommandRunMv (
>> @retval other pointer to a fuly qualified path.
>> **/
>> CHAR16*
>> -EFIAPI
>> GetFullyQualifiedPath(
>> IN CONST CHAR16* Path
>> );
>> @@ -276,7 +275,6 @@ GetFullyQualifiedPath(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> VerifyIntermediateDirectories (
>> IN CONST CHAR16 *Path
>> );
>> @@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
>> @return non-zero if the strings are different.
>> **/
>> CONST CHAR16*
>> -EFIAPI
>> StrniCmp(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Target,
>> @@ -310,7 +307,6 @@ StrniCmp(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ShellLevel2StripQuotes (
>> IN CONST CHAR16 *OriginalString,
>> OUT CHAR16 **CleanString
>> @@ -343,7 +339,6 @@ ShellCommandRunVol (
>> @retval SHELL_SUCCESS The source file was copied to the destination
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CopySingleFile(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Dest,
>> @@ -364,7 +359,6 @@ CopySingleFile(
>> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CascadeDelete(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CONST BOOLEAN Quiet
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> index a6f0296..f911c7e 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> @@ -27,7 +27,6 @@
>> @retval SHELL_SUCCESS The operation was sucessful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> HandleVol(
>> IN CONST CHAR16 *Path,
>> IN CONST BOOLEAN Delete,
>> --
>> 2.9.0.windows.1
>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
2017-08-10 0:41 ` Ni, Ruiyu
@ 2017-08-10 0:59 ` Palmer, Thomas
0 siblings, 0 replies; 21+ messages in thread
From: Palmer, Thomas @ 2017-08-10 0:59 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org, Kinney, Michael D
It is not urgent for me.
Regards,
Thomas Palmer
"I have only made this letter longer because I have not had the time to make it shorter" - Blaise Pascal
-----Original Message-----
From: Ni, Ruiyu [mailto:ruiyu.ni@intel.com]
Sent: Wednesday, August 9, 2017 7:42 PM
To: Palmer, Thomas <thomas.palmer@hpe.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
I've submitted a tracker for this:
https://bugzilla.tianocore.org/show_bug.cgi?id=664
It's in my to-do list. do you need the fix urgent?
Regards,
Ray
>-----Original Message-----
>From: Palmer, Thomas [mailto:thomas.palmer@hpe.com]
>Sent: Thursday, August 10, 2017 7:40 AM
>To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org; Kinney,
>Michael D <michael.d.kinney@intel.com>
>Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
>Remove unnecessary EFIAPI
>
>Ruiyu,
>
>Will you put out the appropriate patch or should I?
>
>
>Regards,
>
>Thomas Palmer
>
>"I have only made this letter longer because I have not had the time to
>make it shorter" - Blaise Pascal
>
>-----Original Message-----
>From: Ni, Ruiyu [mailto:ruiyu.ni@intel.com]
>Sent: Monday, August 7, 2017 12:57 AM
>To: Palmer, Thomas <thomas.palmer@hpe.com>; edk2-devel@lists.01.org;
>Kinney, Michael D <michael.d.kinney@intel.com>
>Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
>Remove unnecessary EFIAPI
>
>Because an internal function doesn't need to have EFIAPI prefix.
>I think a proper fix is to change both BaseLib and UefiShellLevel2CommandsLib to add prefix to the function name.
>e.g.: ShellLevel2CommandsLibCharToUpper, BaseLibCharToUpper.
>
>And I am also surprised that BaseLib's version also has the EFIAPI prefix.
>---BaseLib/String.c---
> CHAR16
> EFIAPI
> InternalCharToUpper (
> IN CHAR16 Char
> )
>
>Copying Mike for comments.
>
>Thanks/Ray
>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
>> Of Palmer, Thomas
>> Sent: Friday, August 4, 2017 3:07 AM
>> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
>> Subject: Re: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
>> Remove unnecessary EFIAPI
>>
>> Ruiyu,
>> Sorry for replying to old patch, I was cleaning out some old
>> sandboxes when I stumbled onto this issue.
>>
>> Why is EFIAPI removed from InternalCharToUpper in
>> UefiShellLevel2CommandsLib.c? It is present in both BaseLibInternals.h and
>> String.c. Without EFIAPI, GCC builds of this function can fail
>>
>>
>> Regards,
>>
>> Thomas Palmer
>>
>> "I have only made this letter longer because I have not had the time
>> to make it shorter" - Blaise Pascal
>>
>>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
>> Of Ruiyu Ni
>> Sent: Friday, September 30, 2016 3:18 AM
>> To: edk2-devel@lists.01.org
>> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>; Jaben Carsey
>> <jaben.carsey@intel.com>; Chen A Chen <chen.a.chen@intel.com>
>> Subject: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib:
>> Remove unnecessary EFIAPI
>>
>> From: Ruiyu Ni <Ruiyu.ni@intel.com>
>>
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
>> Cc: Jaben Carsey <jaben.carsey@intel.com>
>> Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
>> ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 ----
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 --
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 -----
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------------
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 -------
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c | 3 ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
>> ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 ----
>> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c | 5 -----
>> .../UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h | 6 ------
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
>> 12 files changed, 53 deletions(-)
>>
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> index eb1f3b6..b8f6d31 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
>> @@ -35,7 +35,6 @@
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ValidateAndCopyFiles(
>> IN CONST EFI_SHELL_FILE_INFO *FileList,
>> IN CONST CHAR16 *DestDir,
>> @@ -58,7 +57,6 @@ ValidateAndCopyFiles(
>> @retval SHELL_SUCCESS The source file was copied to the destination
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CopySingleFile(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Dest,
>> @@ -291,7 +289,6 @@ CopySingleFile(
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ValidateAndCopyFiles(
>> IN CONST EFI_SHELL_FILE_INFO *FileList,
>> IN CONST CHAR16 *DestDir,
>> @@ -576,7 +573,6 @@ ValidateAndCopyFiles(
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ProcessValidateAndCopyFiles(
>> IN EFI_SHELL_FILE_INFO *FileList,
>> IN CONST CHAR16 *DestDir,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> index ff7c818..322d510 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
>> @@ -28,7 +28,6 @@
>>
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ConnectAllEfi (
>> VOID
>> )
>> @@ -74,7 +73,6 @@ ConnectAllEfi (
>> @retval EFI_OUT_OF_RESOURCES there was insufficient memory **/
>> EFI_STATUS -EFIAPI LoadDriver(
>> IN CONST CHAR16 *FileName,
>> IN CONST BOOLEAN Connect
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> index 9b4c452..52ae18f 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
>> @@ -22,7 +22,6 @@
>> @param[in] TheList a list of files from the volume.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PrintSfoVolumeInfoTableEntry(
>> IN CONST EFI_SHELL_FILE_INFO *TheList
>> )
>> @@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
>>
>> **/
>> VOID
>> -EFIAPI
>> PrintFileInformation(
>> IN CONST BOOLEAN Sfo,
>> IN CONST EFI_SHELL_FILE_INFO *TheNode, @@ -263,7 +261,6 @@
>> PrintFileInformation(
>> @param[in] Path String with starting path.
>> **/
>> VOID
>> -EFIAPI
>> PrintNonSfoHeader(
>> IN CONST CHAR16 *Path
>> )
>> @@ -300,7 +297,6 @@ PrintNonSfoHeader(
>> @param[in] Dirs The number of directories.
>> **/
>> VOID
>> -EFIAPI
>> PrintNonSfoFooter(
>> IN UINT64 Files,
>> IN UINT64 Size,
>> @@ -339,7 +335,6 @@ PrintNonSfoFooter(
>> @retval SHELL_SUCCESS the printing was sucessful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PrintLsOutput(
>> IN CONST BOOLEAN Rec,
>> IN CONST UINT64 Attribs,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> index 035aff1..20eb528 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>> @@ -34,7 +34,6 @@
>> @retval FALSE String has at least one other character.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsNumberLetterOnly(
>> IN CONST CHAR16 *String,
>> IN CONST UINTN Len
>> @@ -65,7 +64,6 @@ IsNumberLetterOnly(
>> items (";" normally).
>> **/
>> BOOLEAN
>> -EFIAPI
>> SearchList(
>> IN CONST CHAR16 *List,
>> IN CONST CHAR16 *MetaTarget,
>> @@ -133,7 +131,6 @@ SearchList(
>> @retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.
>> **/
>> CHAR16*
>> -EFIAPI
>> GetDeviceMediaType (
>> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
>> )
>> @@ -179,7 +176,6 @@ GetDeviceMediaType (
>> @retval FALSE The handle does not have removable storage.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsRemoveableDevice (
>> IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
>> )
>> @@ -216,7 +212,6 @@ IsRemoveableDevice (
>> @retval FALSE The map should not be displayed.
>> **/
>> BOOLEAN
>> -EFIAPI
>> MappingListHasType(
>> IN CONST CHAR16 *MapList,
>> IN CONST CHAR16 *Specific,
>> @@ -287,7 +282,6 @@ MappingListHasType(
>> @retval EFI_SUCCESS The mapping was displayed.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PerformSingleMappingDisplay(
>> IN CONST BOOLEAN Verbose,
>> IN CONST BOOLEAN Consist,
>> @@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
>> @retval EFI_NOT_FOUND Name was not a map on Handle.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PerformSingleMappingDelete(
>> IN CONST CHAR16 *Specific,
>> IN CONST EFI_HANDLE Handle
>> @@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
>>
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PerformMappingDisplay(
>> IN CONST BOOLEAN Verbose,
>> IN CONST BOOLEAN Consist,
>> @@ -690,7 +682,6 @@ PerformMappingDisplay(
>> @sa PerformMappingDisplay
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PerformMappingDisplay2(
>> IN CONST BOOLEAN Verbose,
>> IN CONST BOOLEAN Consist,
>> @@ -743,7 +734,6 @@ PerformMappingDisplay2(
>> @retval EFI_NOT_FOUND Specific could not be found.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> PerformMappingDelete(
>> IN CONST CHAR16 *Specific
>> )
>> @@ -874,7 +864,6 @@ PerformMappingDelete(
>>
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> AddMappingFromMapping(
>> IN CONST CHAR16 *Map,
>> IN CONST CHAR16 *SName
>> @@ -931,7 +920,6 @@ AddMappingFromMapping(
>>
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> AddMappingFromHandle(
>> IN CONST EFI_HANDLE Handle,
>> IN CONST CHAR16 *SName
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> index f93772c..efaaeb2 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
>> @@ -26,7 +26,6 @@
>> @retval FALSE The move is within a file system.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsBetweenFileSystem(
>> IN CONST CHAR16 *FullName,
>> IN CONST CHAR16 *Cwd,
>> @@ -79,7 +78,6 @@ IsBetweenFileSystem(
>> @retval FALSE The move is not
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsValidMove(
>> IN CONST CHAR16 *SourcePath,
>> IN CONST CHAR16 *Cwd,
>> @@ -161,7 +159,6 @@ IsValidMove(
>> @retval SHELL_SUCCESS The operation was sucessful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> GetDestinationLocation(
>> IN CONST CHAR16 *DestParameter,
>> IN OUT CHAR16 **DestPathPointer,
>> @@ -286,7 +283,6 @@ GetDestinationLocation(
>> @retval SHELL_SUCCESS The source file was moved to the destination.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> MoveBetweenFileSystems(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CONST CHAR16 *DestPath,
>> @@ -334,7 +330,6 @@ MoveBetweenFileSystems(
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> EFI_STATUS
>> -EFIAPI
>> CreateFullDestPath(
>> IN CONST CHAR16 **DestPath,
>> OUT CHAR16 **FullDestPath,
>> @@ -373,7 +368,6 @@ CreateFullDestPath(
>> @retval SHELL_OUT_OF_RESOURCES A memory allocation failed.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> MoveWithinFileSystems(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CHAR16 *DestPath,
>> @@ -454,7 +448,6 @@ MoveWithinFileSystems(
>> @retval SHELL_OUT_OF_RESOURCES a memory allocation failed
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> ValidateAndMoveFiles(
>> IN EFI_SHELL_FILE_INFO *FileList,
>> OUT VOID **Resp,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> index 12fe877..4b1973a 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
>> @@ -78,7 +78,6 @@ IsStdInDataAvailable (
>> Size was updated to the minimum space required.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ShellFileHandleReadStdInLine(
>> IN SHELL_FILE_HANDLE Handle,
>> IN OUT CHAR16 *Buffer,
>> @@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
>> @sa ShellFileHandleReadLine
>> **/
>> CHAR16*
>> -EFIAPI
>> ParseReturnStdInLine (
>> IN SHELL_FILE_HANDLE Handle
>> )
>> @@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> PerformParsing(
>> IN CONST CHAR16 *FileName,
>> IN CONST CHAR16 *TableName,
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> index 0b23fba..618610d 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
>> @@ -29,7 +29,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
>> @retval FALSE The directory has at least 1 file or directory in it.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsDirectoryEmpty (
>> IN EFI_HANDLE FileHandle
>> )
>> @@ -66,7 +65,6 @@ IsDirectoryEmpty (
>> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CascadeDelete(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CONST BOOLEAN Quiet
>> @@ -195,7 +193,6 @@ CascadeDelete(
>> @param[in] Package RESERVED. Not used.
>> **/
>> BOOLEAN
>> -EFIAPI
>> IsValidDeleteTarget(
>> IN CONST EFI_SHELL_FILE_INFO *List,
>> IN CONST EFI_SHELL_FILE_INFO *Node, diff --git
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> index d5e6a08..7ca1942 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
>> @@ -24,7 +24,6 @@
>> @return any return code from GetNextVariableName except
>> EFI_NOT_FOUND **/ SHELL_STATUS -EFIAPI PrintAllShellEnvVars(
>> VOID
>> )
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> index 533519d..3ebc72a 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
>> @@ -28,7 +28,6 @@
>> @retval FALSE String is invalid.
>> **/
>> BOOLEAN
>> -EFIAPI
>> InternalIsTimeLikeString (
>> IN CONST CHAR16 *String,
>> IN CONST CHAR16 Char,
>> @@ -87,7 +86,6 @@ InternalIsTimeLikeString (
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CheckAndSetDate (
>> IN CONST CHAR16 *DateString
>> )
>> @@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CheckAndSetTime (
>> IN CONST CHAR16 *TimeString,
>> IN CONST INT16 Tz,
>> @@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM
>> TimeZoneParamList3[] = {
>> @retval SHELL_SUCCESS The operation was successful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CheckAndSetTimeZone (
>> IN CONST CHAR16 *TimeZoneString
>> )
>> diff --git
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.c
>> index 0dafb19..1491ee9 100644
>> ---
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.c
>> +++
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
>> +++ sLib.c
>> @@ -169,7 +169,6 @@ ShellLevel2CommandsLibDestructor (
>> @retval other An allocated pointer to a fuly qualified path.
>> **/
>> CHAR16*
>> -EFIAPI
>> GetFullyQualifiedPath(
>> IN CONST CHAR16* Path
>> )
>> @@ -216,7 +215,6 @@ GetFullyQualifiedPath(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> VerifyIntermediateDirectories (
>> IN CONST CHAR16 *Path
>> )
>> @@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
>> @return Char as an upper case character.
>> **/
>> CHAR16
>> -EFIAPI
>> InternalCharToUpper (
>> IN CONST CHAR16 Char
>> );
>> @@ -286,7 +283,6 @@ InternalCharToUpper (
>> @return The location in Source where there is a difference.
>> **/
>> CONST CHAR16*
>> -EFIAPI
>> StrniCmp(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Target,
>> @@ -322,7 +318,6 @@ StrniCmp(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ShellLevel2StripQuotes (
>> IN CONST CHAR16 *OriginalString,
>> OUT CHAR16 **CleanString
>> diff --git
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.h
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.h
>> index 634515e..19e46a1 100644
>> ---
>> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands
>> Lib.h
>> +++
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
>> +++ sLib.h
>> @@ -263,7 +263,6 @@ ShellCommandRunMv (
>> @retval other pointer to a fuly qualified path.
>> **/
>> CHAR16*
>> -EFIAPI
>> GetFullyQualifiedPath(
>> IN CONST CHAR16* Path
>> );
>> @@ -276,7 +275,6 @@ GetFullyQualifiedPath(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> VerifyIntermediateDirectories (
>> IN CONST CHAR16 *Path
>> );
>> @@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
>> @return non-zero if the strings are different.
>> **/
>> CONST CHAR16*
>> -EFIAPI
>> StrniCmp(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Target,
>> @@ -310,7 +307,6 @@ StrniCmp(
>> @retval EFI_SUCCESS The operation was successful.
>> **/
>> EFI_STATUS
>> -EFIAPI
>> ShellLevel2StripQuotes (
>> IN CONST CHAR16 *OriginalString,
>> OUT CHAR16 **CleanString
>> @@ -343,7 +339,6 @@ ShellCommandRunVol (
>> @retval SHELL_SUCCESS The source file was copied to the destination
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CopySingleFile(
>> IN CONST CHAR16 *Source,
>> IN CONST CHAR16 *Dest,
>> @@ -364,7 +359,6 @@ CopySingleFile(
>> @retval SHELL_DEVICE_ERROR A device error occured reading this Node.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> CascadeDelete(
>> IN EFI_SHELL_FILE_INFO *Node,
>> IN CONST BOOLEAN Quiet
>> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> index a6f0296..f911c7e 100644
>> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
>> @@ -27,7 +27,6 @@
>> @retval SHELL_SUCCESS The operation was sucessful.
>> **/
>> SHELL_STATUS
>> -EFIAPI
>> HandleVol(
>> IN CONST CHAR16 *Path,
>> IN CONST BOOLEAN Delete,
>> --
>> 2.9.0.windows.1
>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 06/11] ShellPkg/UefiShellLevel3CommandsLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (4 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 07/11] ShellPkg/UefiShellParsingLib: " Ruiyu Ni
` (6 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c | 1 -
ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c | 4 ----
ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c | 2 --
ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c | 1 -
4 files changed, 8 deletions(-)
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
index bcd14c8..5a3b7e5 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
@@ -24,7 +24,6 @@
@return any return code from GetNextVariableName except EFI_NOT_FOUND
**/
SHELL_STATUS
-EFIAPI
PrintAllShellAlias(
VOID
)
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
index 619cdd3..5940a1e 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
@@ -37,7 +37,6 @@
@retval EFI_SUCCESS the operation was successful.
**/
EFI_STATUS
-EFIAPI
LexicalInsertIntoList(
IN OUT CHAR16 **DestList,
IN OUT UINTN *DestSize,
@@ -116,7 +115,6 @@ LexicalInsertIntoList(
@retval EFI_SUCCESS the operation was successful.
**/
EFI_STATUS
-EFIAPI
CopyListOfCommandNames(
IN OUT CHAR16 **DestList,
IN OUT UINTN *DestSize,
@@ -147,7 +145,6 @@ CopyListOfCommandNames(
**/
STATIC
EFI_STATUS
-EFIAPI
CopyListOfCommandNamesWithDynamic(
IN OUT CHAR16** DestList,
IN OUT UINTN *DestSize
@@ -205,7 +202,6 @@ CopyListOfCommandNamesWithDynamic(
@retval EFI_DEVICE_ERROR The help data format was incorrect.
**/
EFI_STATUS
-EFIAPI
PrintDynamicCommandHelp(
IN CONST CHAR16 *CommandToGetHelpOn,
IN CONST CHAR16 *SectionToGetHelpOn,
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c
index 88c5d75..639346f 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c
@@ -26,7 +26,6 @@
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
TouchFileByHandle (
IN EFI_HANDLE Handle
)
@@ -65,7 +64,6 @@ TouchFileByHandle (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
DoTouchByHandle (
IN CONST CHAR16 *Name,
IN CHAR16 *FS,
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
index ccd1199b..50d18e4 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
@@ -30,7 +30,6 @@
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
TypeFileByHandle (
IN SHELL_FILE_HANDLE Handle,
IN BOOLEAN Ascii,
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 07/11] ShellPkg/UefiShellParsingLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (5 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 06/11] ShellPkg/UefiShellLevel3CommandsLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 08/11] ShellPkg/UefiShellBcfgCommandLib: " Ruiyu Ni
` (5 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 695d090..28a582f 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -29,7 +29,6 @@ UINTN GuidListCount;
@retval A string representation of the type allocated from BS Pool.
**/
CHAR16*
-EFIAPI
ConvertMemoryType (
IN CONST EFI_MEMORY_TYPE Memory
)
@@ -66,7 +65,6 @@ ConvertMemoryType (
@retval A string representation of the type allocated from BS Pool.
**/
CHAR16*
-EFIAPI
ConvertPixelFormat (
IN CONST EFI_GRAPHICS_PIXEL_FORMAT Fmt
)
@@ -1831,7 +1829,6 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {
@return The node.
**/
CONST GUID_INFO_BLOCK *
-EFIAPI
InternalShellGetNodeFromGuid(
IN CONST EFI_GUID* Guid
)
@@ -1875,7 +1872,6 @@ Function to add a new GUID/Name mapping.
@retval EFI_INVALID_PARAMETER Guid NameId was invalid
**/
EFI_STATUS
-EFIAPI
InsertNewGuidNameMapping(
IN CONST EFI_GUID *Guid,
IN CONST EFI_STRING_ID NameID,
@@ -2190,7 +2186,6 @@ GetStringNameFromHandle(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
InternalShellInitHandleList(
VOID
)
@@ -2837,7 +2832,6 @@ ParseHandleDatabaseForChildControllers(
@return A pointer to (*DestinationBuffer).
**/
VOID*
-EFIAPI
BuffernCatGrow (
IN OUT VOID **DestinationBuffer,
IN OUT UINTN *DestinationSize,
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 08/11] ShellPkg/UefiShellBcfgCommandLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (6 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 07/11] ShellPkg/UefiShellParsingLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 09/11] ShellPkg/UefiShellCommandLib: " Ruiyu Ni
` (4 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
.../Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
index e2306bf..dc3714d 100644
--- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
+++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
@@ -89,7 +89,6 @@ typedef struct {
@retval other A error occured.
**/
EFI_STATUS
-EFIAPI
UpdateOptionalData(
UINT16 Index,
UINTN DataSize,
@@ -175,7 +174,6 @@ UpdateOptionalData(
@retval other A error occured.
**/
EFI_STATUS
-EFIAPI
GetBootOptionCrc(
UINT32 *Crc,
UINT16 BootIndex
@@ -232,7 +230,6 @@ GetBootOptionCrc(
@sa HandleProtocol
**/
EFI_STATUS
-EFIAPI
GetDevicePathForDriverHandle (
IN EFI_HANDLE TheHandle,
IN OUT EFI_DEVICE_PATH_PROTOCOL **FilePath
@@ -295,7 +292,6 @@ GetDevicePathForDriverHandle (
@retval SHELL_INVALID_PARAMETER A parameter was invalid.
**/
SHELL_STATUS
-EFIAPI
BcfgAdd(
IN UINTN Position,
IN CONST CHAR16 *File,
@@ -619,7 +615,6 @@ BcfgAdd(
@retval SHELL_INVALID_PARAMETER A parameter was invalid.
**/
SHELL_STATUS
-EFIAPI
BcfgRemove(
IN CONST BCFG_OPERATION_TARGET Target,
IN CONST UINT16 *CurrentOrder,
@@ -680,7 +675,6 @@ BcfgRemove(
@retval SHELL_INVALID_PARAMETER A parameter was invalid.
**/
SHELL_STATUS
-EFIAPI
BcfgMove(
IN CONST BCFG_OPERATION_TARGET Target,
IN CONST UINT16 *CurrentOrder,
@@ -741,7 +735,6 @@ BcfgMove(
@retval SHELL_SUCCESS The operation was succesful.
**/
SHELL_STATUS
-EFIAPI
BcfgAddOpt(
IN CONST CHAR16 *OptData,
IN CONST UINT16 *CurrentOrder,
@@ -1028,7 +1021,6 @@ BcfgAddOpt(
@retval SHELL_INVALID_PARAMETER A parameter was invalid.
**/
SHELL_STATUS
-EFIAPI
BcfgDisplayDump(
IN CONST CHAR16 *Op,
IN CONST UINTN OrderCount,
@@ -1153,7 +1145,6 @@ Cleanup:
@param[in] Struct The stuct to initialize.
**/
VOID
-EFIAPI
InitBcfgStruct(
IN BGFG_OPERATION *Struct
)
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 09/11] ShellPkg/UefiShellCommandLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (7 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 08/11] ShellPkg/UefiShellBcfgCommandLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 10/11] ShellPkg/UefiShellLib: " Ruiyu Ni
` (3 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c | 3 ---
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 6 ------
2 files changed, 9 deletions(-)
diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 979693a..09f2c56 100755
--- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
+++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
@@ -1333,7 +1333,6 @@ DEV_PATH_CONSIST_MAPPING_TABLE DevPathConsistMappingTable[] = {
@retval FALSE The node is not Hi.
**/
BOOLEAN
-EFIAPI
IsHIDevicePathNode (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePathNode
)
@@ -1370,7 +1369,6 @@ IsHIDevicePathNode (
@return the device path portion that is Hi.
**/
EFI_DEVICE_PATH_PROTOCOL *
-EFIAPI
GetHIDevicePath (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -1425,7 +1423,6 @@ GetHIDevicePath (
@return EFI_SUCCESS Always returns success.
**/
EFI_STATUS
-EFIAPI
GetDeviceConsistMappingInfo (
IN DEVICE_CONSIST_MAPPING_INFO *MappingItem,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index b65676b..1391768 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -128,7 +128,6 @@ ShellCommandLibConstructor (
@param[in] List The list to free.
**/
VOID
-EFIAPI
FreeFileHandleList (
IN BUFFER_LIST *List
)
@@ -244,7 +243,6 @@ ShellCommandLibDestructor (
@retval NULL no dynamic command protocol instance found for name
**/
CONST EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *
-EFIAPI
ShellCommandFindDynamicCommand (
IN CONST CHAR16 *CommandString
)
@@ -293,7 +291,6 @@ ShellCommandFindDynamicCommand (
@param[in] CommandString The command string to check for on the list.
**/
BOOLEAN
-EFIAPI
ShellCommandDynamicCommandExists (
IN CONST CHAR16 *CommandString
)
@@ -307,7 +304,6 @@ ShellCommandDynamicCommandExists (
@param[in] CommandString The command string to check for on the list.
**/
BOOLEAN
-EFIAPI
ShellCommandIsCommandOnInternalList(
IN CONST CHAR16 *CommandString
)
@@ -365,7 +361,6 @@ ShellCommandIsCommandOnList(
@return String of help text. Caller required to free.
**/
CHAR16*
-EFIAPI
ShellCommandGetDynamicCommandHelp(
IN CONST CHAR16 *CommandString
)
@@ -392,7 +387,6 @@ ShellCommandGetDynamicCommandHelp(
@return String of help text. Caller reuiqred to free.
**/
CHAR16*
-EFIAPI
ShellCommandGetInternalCommandHelp(
IN CONST CHAR16 *CommandString
)
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 10/11] ShellPkg/UefiShellLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (8 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 09/11] ShellPkg/UefiShellCommandLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 8:17 ` [PATCH 11/11] ShellPkg/UefiShellNetwork1CommandsLib: " Ruiyu Ni
` (2 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellLib/UefiShellLib.c | 14 --------------
ShellPkg/Library/UefiShellLib/UefiShellLib.h | 2 --
2 files changed, 16 deletions(-)
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index e47d535..7625feb 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -92,7 +92,6 @@ ShellIsDecimalDigitCharacter (
@retval EFI_OUT_OF_RESOURCES Memory allocation failed.
**/
EFI_STATUS
-EFIAPI
ShellFindSE2 (
IN EFI_HANDLE ImageHandle
)
@@ -176,7 +175,6 @@ ShellFindSE2 (
@retval EFI_SUCCESS The operationw as successful.
**/
EFI_STATUS
-EFIAPI
ShellLibConstructorWorker (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
@@ -1418,7 +1416,6 @@ typedef struct {
@retval the resultant head of the double linked new format list;
**/
LIST_ENTRY*
-EFIAPI
InternalShellConvertFileListType (
IN LIST_ENTRY *FileList,
IN OUT LIST_ENTRY *ListHead
@@ -1888,7 +1885,6 @@ typedef struct {
@retval FALSE the Parameter was not found. Type is not valid.
**/
BOOLEAN
-EFIAPI
InternalIsOnCheckList (
IN CONST CHAR16 *Name,
IN CONST SHELL_PARAM_ITEM *CheckList,
@@ -1957,7 +1953,6 @@ InternalIsOnCheckList (
@retval FALSE the Parameter not a flag.
**/
BOOLEAN
-EFIAPI
InternalIsFlag (
IN CONST CHAR16 *Name,
IN CONST BOOLEAN AlwaysAllowNumbers,
@@ -2014,7 +2009,6 @@ InternalIsFlag (
ProblemParam if provided.
**/
EFI_STATUS
-EFIAPI
InternalCommandLineParse (
IN CONST SHELL_PARAM_ITEM *CheckList,
OUT LIST_ENTRY **CheckPackage,
@@ -2703,7 +2697,6 @@ ShellCopySearchAndReplace(
@retval !EFI_SUCCESS The operation failed.
**/
EFI_STATUS
-EFIAPI
InternalPrintTo (
IN CONST CHAR16 *String
)
@@ -2759,7 +2752,6 @@ InternalPrintTo (
@return EFI_DEVICE_ERROR The console device reported an error.
**/
EFI_STATUS
-EFIAPI
InternalShellPrintWorker(
IN INT32 Col OPTIONAL,
IN INT32 Row OPTIONAL,
@@ -3609,7 +3601,6 @@ ShellPromptForResponseHii (
@retval FALSE There is a non-numeric character.
**/
BOOLEAN
-EFIAPI
InternalShellIsHexOrDecimalNumber (
IN CONST CHAR16 *String,
IN CONST BOOLEAN ForceHex,
@@ -3722,7 +3713,6 @@ ShellFileExists(
**/
CHAR16
-EFIAPI
InternalShellCharToUpper (
IN CHAR16 Char
)
@@ -3748,7 +3738,6 @@ InternalShellCharToUpper (
**/
UINTN
-EFIAPI
InternalShellHexCharToUintn (
IN CHAR16 Char
)
@@ -3791,7 +3780,6 @@ InternalShellHexCharToUintn (
@retval EFI_DEVICE_ERROR An overflow occured.
**/
EFI_STATUS
-EFIAPI
InternalShellStrHexToUint64 (
IN CONST CHAR16 *String,
OUT UINT64 *Value,
@@ -3893,7 +3881,6 @@ InternalShellStrHexToUint64 (
@retval EFI_DEVICE_ERROR An overflow occured.
**/
EFI_STATUS
-EFIAPI
InternalShellStrDecimalToUint64 (
IN CONST CHAR16 *String,
OUT UINT64 *Value,
@@ -4345,7 +4332,6 @@ ShellDeleteFileByName(
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
InternalShellStripQuotes (
IN CONST CHAR16 *OriginalString,
OUT CHAR16 **CleanString
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.h b/ShellPkg/Library/UefiShellLib/UefiShellLib.h
index b323bcf..955f8ac 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.h
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.h
@@ -68,7 +68,6 @@ typedef struct {
@retval FALSE There is a non-numeric character.
**/
BOOLEAN
-EFIAPI
InternalShellIsHexOrDecimalNumber (
IN CONST CHAR16 *String,
IN CONST BOOLEAN ForceHex,
@@ -87,7 +86,6 @@ InternalShellIsHexOrDecimalNumber (
@retval EFI_SUCCESS The operation was successful.
**/
EFI_STATUS
-EFIAPI
InternalShellStripQuotes (
IN CONST CHAR16 *OriginalString,
OUT CHAR16 **CleanString
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 11/11] ShellPkg/UefiShellNetwork1CommandsLib: Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (9 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 10/11] ShellPkg/UefiShellLib: " Ruiyu Ni
@ 2016-09-30 8:17 ` Ruiyu Ni
2016-09-30 15:13 ` [PATCH 00/11] " Carsey, Jaben
2016-10-13 1:31 ` Ni, Ruiyu
12 siblings, 0 replies; 21+ messages in thread
From: Ruiyu Ni @ 2016-09-30 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ruiyu Ni, Chen A Chen, Jaben Carsey
From: Ruiyu Ni <Ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
---
ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
index e2dc765..38625fe 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
@@ -148,7 +148,6 @@ typedef struct _PING_PRIVATE_DATA {
ones complement sum of 16 bit words
**/
UINT16
-EFIAPI
NetChecksum (
IN UINT8 *Buffer,
IN UINT32 Length
@@ -231,7 +230,6 @@ EFI_CPU_ARCH_PROTOCOL *gCpu = NULL;
@retval the current tick value.
**/
UINT64
-EFIAPI
ReadTime (
VOID
)
@@ -263,7 +261,6 @@ ReadTime (
**/
EFI_STATUS
-EFIAPI
GetFrequency (
VOID
)
@@ -302,7 +299,6 @@ GetFrequency (
@retval 0 The parameters were not valid.
**/
UINT64
-EFIAPI
CalculateTick (
IN UINT64 Begin,
IN UINT64 End
@@ -321,7 +317,6 @@ CalculateTick (
@param[in] IpChoice Whether the token is IPv4 or IPv6
**/
VOID
-EFIAPI
PingDestroyTxInfo (
IN PING_ICMPX_TX_INFO *TxInfo,
IN UINT32 IpChoice
@@ -393,7 +388,6 @@ PingDestroyTxInfo (
**/
EFI_STATUS
-EFIAPI
Ping6MatchEchoReply (
IN PING_PRIVATE_DATA *Private,
IN ICMPX_ECHO_REQUEST_REPLY *Packet
@@ -569,7 +563,6 @@ ON_EXIT:
**/
PING_IPX_COMPLETION_TOKEN *
-EFIAPI
PingGenerateToken (
IN PING_PRIVATE_DATA *Private,
IN UINT64 TimeStamp,
@@ -672,7 +665,6 @@ PingGenerateToken (
**/
EFI_STATUS
-EFIAPI
PingSendEchoRequest (
IN PING_PRIVATE_DATA *Private
)
@@ -723,7 +715,6 @@ PingSendEchoRequest (
**/
EFI_STATUS
-EFIAPI
Ping6ReceiveEchoReply (
IN PING_PRIVATE_DATA *Private
)
@@ -835,7 +826,6 @@ Ping6OnTimerRoutine (
@retval FALSE It is not.
**/
BOOLEAN
-EFIAPI
PingNetIp4IsLinkLocalAddr (
IN CONST EFI_IPv4_ADDRESS *Address
)
@@ -852,7 +842,6 @@ PingNetIp4IsLinkLocalAddr (
@retval FALSE It is not.
**/
BOOLEAN
-EFIAPI
PingNetIp4IsUnspecifiedAddr (
IN CONST EFI_IPv4_ADDRESS *Address
)
@@ -872,7 +861,6 @@ PingNetIp4IsUnspecifiedAddr (
@retval EFI_NOT_FOUND The source address is not found.
**/
EFI_STATUS
-EFIAPI
PingCreateIpInstance (
IN PING_PRIVATE_DATA *Private
)
@@ -1226,7 +1214,6 @@ ON_ERROR:
**/
VOID
-EFIAPI
Ping6DestroyIp6Instance (
IN PING_PRIVATE_DATA *Private
)
@@ -1265,7 +1252,6 @@ Ping6DestroyIp6Instance (
@retval others The ping processed unsuccessfully.
**/
SHELL_STATUS
-EFIAPI
ShellPing (
IN UINT32 SendNumber,
IN UINT32 BufferSize,
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 00/11] Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (10 preceding siblings ...)
2016-09-30 8:17 ` [PATCH 11/11] ShellPkg/UefiShellNetwork1CommandsLib: " Ruiyu Ni
@ 2016-09-30 15:13 ` Carsey, Jaben
2016-09-30 16:02 ` Ni, Ruiyu
2016-10-13 1:31 ` Ni, Ruiyu
12 siblings, 1 reply; 21+ messages in thread
From: Carsey, Jaben @ 2016-09-30 15:13 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Carsey, Jaben
I have no objection.
Can you explain the benefit or just remove confusion?
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Friday, September 30, 2016 1:18 AM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [PATCH 00/11] Remove unnecessary EFIAPI
> Importance: High
>
> Many Shell internal functions have EFIAPI modifier.
> But it's not necessary. The patch serials remove the unnecessary
> EFIAPI.
>
> Ruiyu Ni (11):
> ShellPkg/Shell: Remove unnecessary EFIAPI
> ShellPkg/UefiShellDebug1CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellDriver1CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLevel1CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLevel3CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellParsingLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellBcfgCommandLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellCommandLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellNetwork1CommandsLib: Remove unnecessary EFIAPI
>
> ShellPkg/Application/Shell/ConsoleLogger.c | 10 -----
> ShellPkg/Application/Shell/ConsoleLogger.h | 6 ---
> ShellPkg/Application/Shell/ConsoleWrappers.c | 4 --
> ShellPkg/Application/Shell/ConsoleWrappers.h | 4 --
> ShellPkg/Application/Shell/FileHandleInternal.h | 3 --
> ShellPkg/Application/Shell/FileHandleWrappers.c | 6 ---
> ShellPkg/Application/Shell/FileHandleWrappers.h | 2 -
> ShellPkg/Application/Shell/Shell.c | 36 -----------------
> ShellPkg/Application/Shell/Shell.h | 16 --------
> ShellPkg/Application/Shell/ShellEnvVar.c | 4 --
> ShellPkg/Application/Shell/ShellEnvVar.h | 4 --
> ShellPkg/Application/Shell/ShellManParser.c | 9 -----
> ShellPkg/Application/Shell/ShellManParser.h | 2 -
> .../Application/Shell/ShellParametersProtocol.c | 14 -------
> .../Application/Shell/ShellParametersProtocol.h | 8 ----
> ShellPkg/Application/Shell/ShellProtocol.c | 25 ++----------
> ShellPkg/Application/Shell/ShellProtocol.h | 9 -----
> .../UefiHandleParsingLib/UefiHandleParsingLib.c | 6 ---
> .../UefiShellBcfgCommandLib.c | 9 -----
> .../Library/UefiShellCommandLib/ConsistMapping.c | 3 --
> .../UefiShellCommandLib/UefiShellCommandLib.c | 6 ---
> .../Library/UefiShellDebug1CommandsLib/Compress.c | 30 ---------------
> ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c | 1 -
> ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 2 -
> .../Library/UefiShellDebug1CommandsLib/DmpStore.c | 3 --
> .../UefiShellDebug1CommandsLib/Edit/FileBuffer.c | 45 ----------------------
> .../UefiShellDebug1CommandsLib/Edit/FileBuffer.h | 17 --------
> .../Edit/MainTextEditor.c | 9 -----
> .../Edit/MainTextEditor.h | 5 ---
> .../Library/UefiShellDebug1CommandsLib/Edit/Misc.c | 2 -
> .../Library/UefiShellDebug1CommandsLib/Edit/Misc.h | 2 -
> .../UefiShellDebug1CommandsLib/EditInputBar.c | 7 ----
> .../UefiShellDebug1CommandsLib/EditInputBar.h | 6 ---
> .../UefiShellDebug1CommandsLib/EditMenuBar.c | 6 ---
> .../UefiShellDebug1CommandsLib/EditMenuBar.h | 6 ---
> .../UefiShellDebug1CommandsLib/EditStatusBar.c | 7 ----
> .../UefiShellDebug1CommandsLib/EditStatusBar.h | 7 ----
> .../UefiShellDebug1CommandsLib/EditTitleBar.c | 3 --
> .../UefiShellDebug1CommandsLib/EditTitleBar.h | 3 --
> .../HexEdit/BufferImage.c | 9 -----
> .../HexEdit/BufferImage.h | 4 --
> .../UefiShellDebug1CommandsLib/HexEdit/DiskImage.c | 1 -
> .../HexEdit/MainHexEditor.c | 1 -
> .../HexEdit/MainHexEditor.h | 1 -
> .../UefiShellDebug1CommandsLib/LoadPciRom.c | 2 -
> ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c | 1 -
> ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c | 18 ---------
> .../Library/UefiShellDebug1CommandsLib/SerMode.c | 1 -
> .../Library/UefiShellDebug1CommandsLib/SetVar.c | 1 -
> .../SmbiosView/EventLogInfo.c | 5 ---
> .../SmbiosView/EventLogInfo.h | 5 ---
> .../SmbiosView/SmbiosView.c | 8 ----
> .../SmbiosView/SmbiosView.h | 7 ----
> .../UefiShellDebug1CommandsLib.c | 9 -----
> .../UefiShellDebug1CommandsLib.h | 7 ----
> .../Library/UefiShellDriver1CommandsLib/Connect.c | 3 --
> .../Library/UefiShellDriver1CommandsLib/DevTree.c | 1 -
> .../Library/UefiShellDriver1CommandsLib/Devices.c | 1 -
> ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c | 9 -----
> .../UefiShellDriver1CommandsLib/Disconnect.c | 1 -
> .../Library/UefiShellDriver1CommandsLib/Drivers.c | 4 --
> .../Library/UefiShellDriver1CommandsLib/DrvCfg.c | 7 ----
> .../Library/UefiShellDriver1CommandsLib/DrvDiag.c | 1 -
> .../Library/UefiShellDriver1CommandsLib/OpenInfo.c | 1 -
> .../UefiShellDriver1CommandsLib.h | 1 -
> .../Library/UefiShellDriver1CommandsLib/Unload.c | 1 -
> ShellPkg/Library/UefiShellLevel1CommandsLib/For.c | 5 ---
> ShellPkg/Library/UefiShellLevel1CommandsLib/If.c | 6 ---
> .../UefiShellLevel1CommandsLib.c | 2 -
> .../UefiShellLevel1CommandsLib.h | 1 -
> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 -
> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 ----
> .../Library/UefiShellLevel2CommandsLib/Parse.c | 3 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
> .../Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 --
> .../UefiShellLevel2CommandsLib.c | 5 ---
> .../UefiShellLevel2CommandsLib.h | 6 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
> .../Library/UefiShellLevel3CommandsLib/Alias.c | 1 -
> ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c | 4 --
> .../Library/UefiShellLevel3CommandsLib/Touch.c | 2 -
> ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c | 1 -
> ShellPkg/Library/UefiShellLib/UefiShellLib.c | 14 -------
> ShellPkg/Library/UefiShellLib/UefiShellLib.h | 2 -
> .../Library/UefiShellNetwork1CommandsLib/Ping.c | 14 -------
> 89 files changed, 4 insertions(+), 558 deletions(-)
>
> --
> 2.9.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 00/11] Remove unnecessary EFIAPI
2016-09-30 15:13 ` [PATCH 00/11] " Carsey, Jaben
@ 2016-09-30 16:02 ` Ni, Ruiyu
0 siblings, 0 replies; 21+ messages in thread
From: Ni, Ruiyu @ 2016-09-30 16:02 UTC (permalink / raw)
To: Carsey, Jaben; +Cc: edk2-devel@lists.01.org
Just remove confusion.
Thanks,
Ray
> 在 2016年9月30日，下午11:13，Carsey, Jaben <jaben.carsey@intel.com> 写道：
>
> I have no objection.
>
> Can you explain the benefit or just remove confusion?
>
> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>> Ruiyu Ni
>> Sent: Friday, September 30, 2016 1:18 AM
>> To: edk2-devel@lists.01.org
>> Subject: [edk2] [PATCH 00/11] Remove unnecessary EFIAPI
>> Importance: High
>>
>> Many Shell internal functions have EFIAPI modifier.
>> But it's not necessary. The patch serials remove the unnecessary
>> EFIAPI.
>>
>> Ruiyu Ni (11):
>> ShellPkg/Shell: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellDebug1CommandsLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellDriver1CommandsLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellLevel1CommandsLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellLevel3CommandsLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellParsingLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellBcfgCommandLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellCommandLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellLib: Remove unnecessary EFIAPI
>> ShellPkg/UefiShellNetwork1CommandsLib: Remove unnecessary EFIAPI
>>
>> ShellPkg/Application/Shell/ConsoleLogger.c | 10 -----
>> ShellPkg/Application/Shell/ConsoleLogger.h | 6 ---
>> ShellPkg/Application/Shell/ConsoleWrappers.c | 4 --
>> ShellPkg/Application/Shell/ConsoleWrappers.h | 4 --
>> ShellPkg/Application/Shell/FileHandleInternal.h | 3 --
>> ShellPkg/Application/Shell/FileHandleWrappers.c | 6 ---
>> ShellPkg/Application/Shell/FileHandleWrappers.h | 2 -
>> ShellPkg/Application/Shell/Shell.c | 36 -----------------
>> ShellPkg/Application/Shell/Shell.h | 16 --------
>> ShellPkg/Application/Shell/ShellEnvVar.c | 4 --
>> ShellPkg/Application/Shell/ShellEnvVar.h | 4 --
>> ShellPkg/Application/Shell/ShellManParser.c | 9 -----
>> ShellPkg/Application/Shell/ShellManParser.h | 2 -
>> .../Application/Shell/ShellParametersProtocol.c | 14 -------
>> .../Application/Shell/ShellParametersProtocol.h | 8 ----
>> ShellPkg/Application/Shell/ShellProtocol.c | 25 ++----------
>> ShellPkg/Application/Shell/ShellProtocol.h | 9 -----
>> .../UefiHandleParsingLib/UefiHandleParsingLib.c | 6 ---
>> .../UefiShellBcfgCommandLib.c | 9 -----
>> .../Library/UefiShellCommandLib/ConsistMapping.c | 3 --
>> .../UefiShellCommandLib/UefiShellCommandLib.c | 6 ---
>> .../Library/UefiShellDebug1CommandsLib/Compress.c | 30 ---------------
>> ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c | 1 -
>> ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 2 -
>> .../Library/UefiShellDebug1CommandsLib/DmpStore.c | 3 --
>> .../UefiShellDebug1CommandsLib/Edit/FileBuffer.c | 45 ----------------------
>> .../UefiShellDebug1CommandsLib/Edit/FileBuffer.h | 17 --------
>> .../Edit/MainTextEditor.c | 9 -----
>> .../Edit/MainTextEditor.h | 5 ---
>> .../Library/UefiShellDebug1CommandsLib/Edit/Misc.c | 2 -
>> .../Library/UefiShellDebug1CommandsLib/Edit/Misc.h | 2 -
>> .../UefiShellDebug1CommandsLib/EditInputBar.c | 7 ----
>> .../UefiShellDebug1CommandsLib/EditInputBar.h | 6 ---
>> .../UefiShellDebug1CommandsLib/EditMenuBar.c | 6 ---
>> .../UefiShellDebug1CommandsLib/EditMenuBar.h | 6 ---
>> .../UefiShellDebug1CommandsLib/EditStatusBar.c | 7 ----
>> .../UefiShellDebug1CommandsLib/EditStatusBar.h | 7 ----
>> .../UefiShellDebug1CommandsLib/EditTitleBar.c | 3 --
>> .../UefiShellDebug1CommandsLib/EditTitleBar.h | 3 --
>> .../HexEdit/BufferImage.c | 9 -----
>> .../HexEdit/BufferImage.h | 4 --
>> .../UefiShellDebug1CommandsLib/HexEdit/DiskImage.c | 1 -
>> .../HexEdit/MainHexEditor.c | 1 -
>> .../HexEdit/MainHexEditor.h | 1 -
>> .../UefiShellDebug1CommandsLib/LoadPciRom.c | 2 -
>> ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c | 1 -
>> ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c | 18 ---------
>> .../Library/UefiShellDebug1CommandsLib/SerMode.c | 1 -
>> .../Library/UefiShellDebug1CommandsLib/SetVar.c | 1 -
>> .../SmbiosView/EventLogInfo.c | 5 ---
>> .../SmbiosView/EventLogInfo.h | 5 ---
>> .../SmbiosView/SmbiosView.c | 8 ----
>> .../SmbiosView/SmbiosView.h | 7 ----
>> .../UefiShellDebug1CommandsLib.c | 9 -----
>> .../UefiShellDebug1CommandsLib.h | 7 ----
>> .../Library/UefiShellDriver1CommandsLib/Connect.c | 3 --
>> .../Library/UefiShellDriver1CommandsLib/DevTree.c | 1 -
>> .../Library/UefiShellDriver1CommandsLib/Devices.c | 1 -
>> ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c | 9 -----
>> .../UefiShellDriver1CommandsLib/Disconnect.c | 1 -
>> .../Library/UefiShellDriver1CommandsLib/Drivers.c | 4 --
>> .../Library/UefiShellDriver1CommandsLib/DrvCfg.c | 7 ----
>> .../Library/UefiShellDriver1CommandsLib/DrvDiag.c | 1 -
>> .../Library/UefiShellDriver1CommandsLib/OpenInfo.c | 1 -
>> .../UefiShellDriver1CommandsLib.h | 1 -
>> .../Library/UefiShellDriver1CommandsLib/Unload.c | 1 -
>> ShellPkg/Library/UefiShellLevel1CommandsLib/For.c | 5 ---
>> ShellPkg/Library/UefiShellLevel1CommandsLib/If.c | 6 ---
>> .../UefiShellLevel1CommandsLib.c | 2 -
>> .../UefiShellLevel1CommandsLib.h | 1 -
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 --
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 -
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 ----
>> .../Library/UefiShellLevel2CommandsLib/Parse.c | 3 --
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 --
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
>> .../Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 --
>> .../UefiShellLevel2CommandsLib.c | 5 ---
>> .../UefiShellLevel2CommandsLib.h | 6 ---
>> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
>> .../Library/UefiShellLevel3CommandsLib/Alias.c | 1 -
>> ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c | 4 --
>> .../Library/UefiShellLevel3CommandsLib/Touch.c | 2 -
>> ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c | 1 -
>> ShellPkg/Library/UefiShellLib/UefiShellLib.c | 14 -------
>> ShellPkg/Library/UefiShellLib/UefiShellLib.h | 2 -
>> .../Library/UefiShellNetwork1CommandsLib/Ping.c | 14 -------
>> 89 files changed, 4 insertions(+), 558 deletions(-)
>>
>> --
>> 2.9.0.windows.1
>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 00/11] Remove unnecessary EFIAPI
2016-09-30 8:17 [PATCH 00/11] Remove unnecessary EFIAPI Ruiyu Ni
` (11 preceding siblings ...)
2016-09-30 15:13 ` [PATCH 00/11] " Carsey, Jaben
@ 2016-10-13 1:31 ` Ni, Ruiyu
12 siblings, 0 replies; 21+ messages in thread
From: Ni, Ruiyu @ 2016-10-13 1:31 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org
I actually off-line reviewed the 11 patches before sending them out.
Reviewed-by: Ruiyu Ni <Ruiyu.ni@intel.com>
Regards,
Ray
>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu Ni
>Sent: Friday, September 30, 2016 4:18 PM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [PATCH 00/11] Remove unnecessary EFIAPI
>
>Many Shell internal functions have EFIAPI modifier.
>But it's not necessary. The patch serials remove the unnecessary
>EFIAPI.
>
>Ruiyu Ni (11):
> ShellPkg/Shell: Remove unnecessary EFIAPI
> ShellPkg/UefiShellDebug1CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellDriver1CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLevel1CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLevel3CommandsLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellParsingLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellBcfgCommandLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellCommandLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellLib: Remove unnecessary EFIAPI
> ShellPkg/UefiShellNetwork1CommandsLib: Remove unnecessary EFIAPI
>
> ShellPkg/Application/Shell/ConsoleLogger.c | 10 -----
> ShellPkg/Application/Shell/ConsoleLogger.h | 6 ---
> ShellPkg/Application/Shell/ConsoleWrappers.c | 4 --
> ShellPkg/Application/Shell/ConsoleWrappers.h | 4 --
> ShellPkg/Application/Shell/FileHandleInternal.h | 3 --
> ShellPkg/Application/Shell/FileHandleWrappers.c | 6 ---
> ShellPkg/Application/Shell/FileHandleWrappers.h | 2 -
> ShellPkg/Application/Shell/Shell.c | 36 -----------------
> ShellPkg/Application/Shell/Shell.h | 16 --------
> ShellPkg/Application/Shell/ShellEnvVar.c | 4 --
> ShellPkg/Application/Shell/ShellEnvVar.h | 4 --
> ShellPkg/Application/Shell/ShellManParser.c | 9 -----
> ShellPkg/Application/Shell/ShellManParser.h | 2 -
> .../Application/Shell/ShellParametersProtocol.c | 14 -------
> .../Application/Shell/ShellParametersProtocol.h | 8 ----
> ShellPkg/Application/Shell/ShellProtocol.c | 25 ++----------
> ShellPkg/Application/Shell/ShellProtocol.h | 9 -----
> .../UefiHandleParsingLib/UefiHandleParsingLib.c | 6 ---
> .../UefiShellBcfgCommandLib.c | 9 -----
> .../Library/UefiShellCommandLib/ConsistMapping.c | 3 --
> .../UefiShellCommandLib/UefiShellCommandLib.c | 6 ---
> .../Library/UefiShellDebug1CommandsLib/Compress.c | 30 ---------------
> ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c | 1 -
> ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 2 -
> .../Library/UefiShellDebug1CommandsLib/DmpStore.c | 3 --
> .../UefiShellDebug1CommandsLib/Edit/FileBuffer.c | 45 ----------------------
> .../UefiShellDebug1CommandsLib/Edit/FileBuffer.h | 17 --------
> .../Edit/MainTextEditor.c | 9 -----
> .../Edit/MainTextEditor.h | 5 ---
> .../Library/UefiShellDebug1CommandsLib/Edit/Misc.c | 2 -
> .../Library/UefiShellDebug1CommandsLib/Edit/Misc.h | 2 -
> .../UefiShellDebug1CommandsLib/EditInputBar.c | 7 ----
> .../UefiShellDebug1CommandsLib/EditInputBar.h | 6 ---
> .../UefiShellDebug1CommandsLib/EditMenuBar.c | 6 ---
> .../UefiShellDebug1CommandsLib/EditMenuBar.h | 6 ---
> .../UefiShellDebug1CommandsLib/EditStatusBar.c | 7 ----
> .../UefiShellDebug1CommandsLib/EditStatusBar.h | 7 ----
> .../UefiShellDebug1CommandsLib/EditTitleBar.c | 3 --
> .../UefiShellDebug1CommandsLib/EditTitleBar.h | 3 --
> .../HexEdit/BufferImage.c | 9 -----
> .../HexEdit/BufferImage.h | 4 --
> .../UefiShellDebug1CommandsLib/HexEdit/DiskImage.c | 1 -
> .../HexEdit/MainHexEditor.c | 1 -
> .../HexEdit/MainHexEditor.h | 1 -
> .../UefiShellDebug1CommandsLib/LoadPciRom.c | 2 -
> ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c | 1 -
> ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c | 18 ---------
> .../Library/UefiShellDebug1CommandsLib/SerMode.c | 1 -
> .../Library/UefiShellDebug1CommandsLib/SetVar.c | 1 -
> .../SmbiosView/EventLogInfo.c | 5 ---
> .../SmbiosView/EventLogInfo.h | 5 ---
> .../SmbiosView/SmbiosView.c | 8 ----
> .../SmbiosView/SmbiosView.h | 7 ----
> .../UefiShellDebug1CommandsLib.c | 9 -----
> .../UefiShellDebug1CommandsLib.h | 7 ----
> .../Library/UefiShellDriver1CommandsLib/Connect.c | 3 --
> .../Library/UefiShellDriver1CommandsLib/DevTree.c | 1 -
> .../Library/UefiShellDriver1CommandsLib/Devices.c | 1 -
> ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c | 9 -----
> .../UefiShellDriver1CommandsLib/Disconnect.c | 1 -
> .../Library/UefiShellDriver1CommandsLib/Drivers.c | 4 --
> .../Library/UefiShellDriver1CommandsLib/DrvCfg.c | 7 ----
> .../Library/UefiShellDriver1CommandsLib/DrvDiag.c | 1 -
> .../Library/UefiShellDriver1CommandsLib/OpenInfo.c | 1 -
> .../UefiShellDriver1CommandsLib.h | 1 -
> .../Library/UefiShellDriver1CommandsLib/Unload.c | 1 -
> ShellPkg/Library/UefiShellLevel1CommandsLib/For.c | 5 ---
> ShellPkg/Library/UefiShellLevel1CommandsLib/If.c | 6 ---
> .../UefiShellLevel1CommandsLib.c | 2 -
> .../UefiShellLevel1CommandsLib.h | 1 -
> ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 2 -
> ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 5 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 12 ------
> ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 7 ----
> .../Library/UefiShellLevel2CommandsLib/Parse.c | 3 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c | 3 --
> ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c | 1 -
> .../Library/UefiShellLevel2CommandsLib/TimeDate.c | 4 --
> .../UefiShellLevel2CommandsLib.c | 5 ---
> .../UefiShellLevel2CommandsLib.h | 6 ---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c | 1 -
> .../Library/UefiShellLevel3CommandsLib/Alias.c | 1 -
> ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c | 4 --
> .../Library/UefiShellLevel3CommandsLib/Touch.c | 2 -
> ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c | 1 -
> ShellPkg/Library/UefiShellLib/UefiShellLib.c | 14 -------
> ShellPkg/Library/UefiShellLib/UefiShellLib.h | 2 -
> .../Library/UefiShellNetwork1CommandsLib/Ping.c | 14 -------
> 89 files changed, 4 insertions(+), 558 deletions(-)
>
>--
>2.9.0.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 21+ messages in thread