ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI

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

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index eb1f3b65a3a1fead2250b11d7c408e8dd8365847..b8f6d310f66b9a417590f6a05990ca75ff2fc7a2 100644 (file)
--- 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\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 ValidateAndCopyFiles(\r
   IN CONST EFI_SHELL_FILE_INFO  *FileList,\r
   IN CONST CHAR16               *DestDir,\r
@@ -58,7 +57,6 @@ ValidateAndCopyFiles(
   @retval SHELL_SUCCESS   The source file was copied to the destination\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CopySingleFile(\r
   IN CONST CHAR16 *Source,\r
   IN CONST CHAR16 *Dest,\r
@@ -291,7 +289,6 @@ CopySingleFile(
   @retval SHELL_OUT_OF_RESOURCES    a memory allocation failed\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 ValidateAndCopyFiles(\r
   IN CONST EFI_SHELL_FILE_INFO  *FileList,\r
   IN CONST CHAR16               *DestDir,\r
@@ -576,7 +573,6 @@ ValidateAndCopyFiles(
   @retval SHELL_SUCCESS             The operation was successful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 ProcessValidateAndCopyFiles(\r
   IN       EFI_SHELL_FILE_INFO  *FileList,\r
   IN CONST CHAR16               *DestDir,\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
index ff7c8187c20dcf7c725dfa05c725e8c1e8a00a27..322d510eacd9cf9a255167d4e6d32575470b2d78 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
@@ -28,7 +28,6 @@
 \r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConnectAllEfi (\r
   VOID\r
   )\r
@@ -74,7 +73,6 @@ ConnectAllEfi (
   @retval EFI_OUT_OF_RESOURCES  there was insufficient memory\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 LoadDriver(\r
   IN CONST CHAR16   *FileName,\r
   IN CONST BOOLEAN  Connect\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 9b4c452ca3540b1d4f79adc4856630d09ffb15d1..52ae18f19b43bfc323030d69992e5a05d28e2577 100644 (file)
--- 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.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 PrintSfoVolumeInfoTableEntry(\r
   IN CONST EFI_SHELL_FILE_INFO *TheList\r
   )\r
@@ -152,7 +151,6 @@ PrintSfoVolumeInfoTableEntry(
 \r
 **/\r
 VOID\r
-EFIAPI\r
 PrintFileInformation(\r
   IN CONST BOOLEAN              Sfo, \r
   IN CONST EFI_SHELL_FILE_INFO  *TheNode, \r
@@ -263,7 +261,6 @@ PrintFileInformation(
   @param[in] Path           String with starting path.\r
 **/\r
 VOID\r
-EFIAPI\r
 PrintNonSfoHeader(\r
   IN CONST CHAR16 *Path\r
   )\r
@@ -300,7 +297,6 @@ PrintNonSfoHeader(
   @param[in] Dirs             The number of directories.\r
 **/\r
 VOID\r
-EFIAPI\r
 PrintNonSfoFooter(\r
   IN UINT64                     Files, \r
   IN UINT64                     Size, \r
@@ -339,7 +335,6 @@ PrintNonSfoFooter(
   @retval SHELL_SUCCESS     the printing was sucessful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 PrintLsOutput(\r
   IN CONST BOOLEAN Rec,\r
   IN CONST UINT64  Attribs,\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 035aff1a0fa78f17cb8aefcd886f95b3c5945973..20eb528fa33916ac6cf4aad354802f7bbe8966ef 100644 (file)
--- 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.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsNumberLetterOnly(\r
   IN CONST CHAR16 *String,\r
   IN CONST UINTN  Len\r
@@ -65,7 +64,6 @@ IsNumberLetterOnly(
                           items (";" normally). \r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 SearchList(\r
   IN CONST CHAR16   *List,\r
   IN CONST CHAR16   *MetaTarget,\r
@@ -133,7 +131,6 @@ SearchList(
   @retval STR_MAP_MEDIA_FLOPPY    The media is a floppy drive.\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 GetDeviceMediaType (\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
   )\r
@@ -179,7 +176,6 @@ GetDeviceMediaType (
   @retval FALSE                     The handle does not have removable storage.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsRemoveableDevice (\r
   IN EFI_DEVICE_PATH_PROTOCOL      *DevicePath\r
   )\r
@@ -216,7 +212,6 @@ IsRemoveableDevice (
   @retval FALSE               The map should not be displayed.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 MappingListHasType(\r
   IN CONST CHAR16     *MapList,\r
   IN CONST CHAR16     *Specific,\r
@@ -287,7 +282,6 @@ MappingListHasType(
   @retval EFI_SUCCESS               The mapping was displayed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 PerformSingleMappingDisplay(\r
   IN CONST BOOLEAN    Verbose,\r
   IN CONST BOOLEAN    Consist,\r
@@ -461,7 +455,6 @@ PerformSingleMappingDisplay(
   @retval EFI_NOT_FOUND   Name was not a map on Handle.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 PerformSingleMappingDelete(\r
   IN CONST CHAR16     *Specific,\r
   IN CONST EFI_HANDLE Handle\r
@@ -512,7 +505,6 @@ CONST CHAR16 AnyF[] = L"F*";
 \r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 PerformMappingDisplay(\r
   IN CONST BOOLEAN Verbose,\r
   IN CONST BOOLEAN Consist,\r
@@ -690,7 +682,6 @@ PerformMappingDisplay(
   @sa PerformMappingDisplay\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 PerformMappingDisplay2(\r
   IN CONST BOOLEAN Verbose,\r
   IN CONST BOOLEAN Consist,\r
@@ -743,7 +734,6 @@ PerformMappingDisplay2(
   @retval EFI_NOT_FOUND             Specific could not be found.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 PerformMappingDelete(\r
   IN CONST CHAR16  *Specific\r
   )\r
@@ -874,7 +864,6 @@ PerformMappingDelete(
 \r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 AddMappingFromMapping(\r
   IN CONST CHAR16     *Map,\r
   IN CONST CHAR16     *SName\r
@@ -931,7 +920,6 @@ AddMappingFromMapping(
 \r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 AddMappingFromHandle(\r
   IN CONST EFI_HANDLE Handle,\r
   IN CONST CHAR16     *SName\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index f93772c6f8d144bc869ecf307aad4f0fe231d8f2..efaaeb2d7b3e665f6aef94c140e1fb934eb112d9 100644 (file)
--- 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.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsBetweenFileSystem(\r
   IN CONST CHAR16     *FullName,\r
   IN CONST CHAR16     *Cwd,\r
@@ -79,7 +78,6 @@ IsBetweenFileSystem(
   @retval FALSE       The move is not\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidMove(\r
   IN CONST CHAR16     *SourcePath,\r
   IN CONST CHAR16     *Cwd,\r
@@ -161,7 +159,6 @@ IsValidMove(
   @retval SHELL_SUCCESS            The operation was sucessful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 GetDestinationLocation(\r
   IN CONST CHAR16               *DestParameter,\r
   IN OUT CHAR16                 **DestPathPointer,\r
@@ -286,7 +283,6 @@ GetDestinationLocation(
   @retval SHELL_SUCCESS     The source file was moved to the destination.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 MoveBetweenFileSystems(\r
   IN EFI_SHELL_FILE_INFO  *Node,\r
   IN CONST CHAR16         *DestPath,\r
@@ -334,7 +330,6 @@ MoveBetweenFileSystems(
   @retval SHELL_OUT_OF_RESOURCES    a memory allocation failed\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 CreateFullDestPath(\r
   IN CONST CHAR16 **DestPath,\r
   OUT CHAR16      **FullDestPath, \r
@@ -373,7 +368,6 @@ CreateFullDestPath(
   @retval SHELL_OUT_OF_RESOURCES  A memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 MoveWithinFileSystems(\r
   IN EFI_SHELL_FILE_INFO  *Node,\r
   IN CHAR16               *DestPath,\r
@@ -454,7 +448,6 @@ MoveWithinFileSystems(
   @retval SHELL_OUT_OF_RESOURCES    a memory allocation failed\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 ValidateAndMoveFiles(\r
   IN EFI_SHELL_FILE_INFO        *FileList,\r
   OUT VOID                      **Resp,\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
index 12fe87750c38833723f9a518446d0fed0a23f301..4b1973a5050f6abdf42f04ae21e5ce92c60e11c2 100644 (file)
--- 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.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ShellFileHandleReadStdInLine(\r
   IN SHELL_FILE_HANDLE          Handle,\r
   IN OUT CHAR16                 *Buffer,\r
@@ -160,7 +159,6 @@ ShellFileHandleReadStdInLine(
   @sa ShellFileHandleReadLine\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 ParseReturnStdInLine (\r
   IN SHELL_FILE_HANDLE Handle\r
   )\r
@@ -249,7 +247,6 @@ HandleStringWithEscapeCharForParse (
   @retval SHELL_SUCCESS       The operation was successful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 PerformParsing(\r
   IN CONST CHAR16 *FileName,\r
   IN CONST CHAR16 *TableName,\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
index 0b23fba150815204e2180ac5e8ba9ca7ff4fee9e..618610d0f3dfe9e91b2bad3a4f0745c4a2823fad 100644 (file)
--- 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.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsDirectoryEmpty (\r
   IN EFI_HANDLE   FileHandle\r
   )\r
@@ -66,7 +65,6 @@ IsDirectoryEmpty (
   @retval SHELL_DEVICE_ERROR  A device error occured reading this Node.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CascadeDelete(\r
   IN EFI_SHELL_FILE_INFO  *Node,\r
   IN CONST BOOLEAN        Quiet\r
@@ -195,7 +193,6 @@ CascadeDelete(
   @param[in] Package    RESERVED.  Not used.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidDeleteTarget(\r
   IN CONST EFI_SHELL_FILE_INFO  *List,\r
   IN CONST EFI_SHELL_FILE_INFO  *Node,\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Set.c
index d5e6a089782a5999c5a96acbd5efe02ad9117464..7ca19427d5ef5963bf8b3541e3c51e2f1dc37780 100644 (file)
--- 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\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 PrintAllShellEnvVars(\r
   VOID\r
   )\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
index 533519d49d2ddb90c1cf75de81c79c698d2c5432..3ebc72a0afa869223f6e4cb14811ea616b3c28d2 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
@@ -28,7 +28,6 @@
   @retval FALSE   String is invalid.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 InternalIsTimeLikeString (\r
   IN CONST CHAR16   *String,\r
   IN CONST CHAR16   Char,\r
@@ -87,7 +86,6 @@ InternalIsTimeLikeString (
   @retval SHELL_SUCCESS             The operation was successful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CheckAndSetDate (\r
   IN CONST CHAR16 *DateString\r
   )\r
@@ -301,7 +299,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeParamList3[] = {
   @retval SHELL_SUCCESS             The operation was successful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CheckAndSetTime (\r
   IN CONST CHAR16 *TimeString,\r
   IN CONST INT16  Tz,\r
@@ -701,7 +698,6 @@ STATIC CONST SHELL_PARAM_ITEM TimeZoneParamList3[] = {
   @retval SHELL_SUCCESS             The operation was successful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CheckAndSetTimeZone (\r
   IN CONST CHAR16 *TimeZoneString\r
   )\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index 0dafb19969c5af64d09e3a66d74a6a9533920693..1491ee9d0672190ae6784655ba1d48ef0c3f3638 100644 (file)
--- 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.\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 GetFullyQualifiedPath(\r
   IN CONST CHAR16* Path\r
   )\r
@@ -216,7 +215,6 @@ GetFullyQualifiedPath(
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 VerifyIntermediateDirectories (\r
   IN CONST CHAR16 *Path\r
   )\r
@@ -270,7 +268,6 @@ VerifyIntermediateDirectories (
   @return Char as an upper case character.\r
 **/\r
 CHAR16\r
-EFIAPI\r
 InternalCharToUpper (\r
   IN CONST CHAR16                    Char\r
   );\r
@@ -286,7 +283,6 @@ InternalCharToUpper (
   @return The location in Source where there is a difference.\r
 **/\r
 CONST CHAR16*\r
-EFIAPI\r
 StrniCmp(\r
   IN CONST CHAR16 *Source,\r
   IN CONST CHAR16 *Target,\r
@@ -322,7 +318,6 @@ StrniCmp(
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ShellLevel2StripQuotes (\r
   IN  CONST CHAR16     *OriginalString,\r
   OUT CHAR16           **CleanString\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index 634515e4933ba63a062b3f1a0f0ce060cbf7b54a..19e46a128c2d4d496a34a7873543004581c75af4 100644 (file)
--- 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.\r
 **/\r
 CHAR16*\r
-EFIAPI\r
 GetFullyQualifiedPath(\r
   IN CONST CHAR16* Path\r
   );\r
@@ -276,7 +275,6 @@ GetFullyQualifiedPath(
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 VerifyIntermediateDirectories (\r
   IN CONST CHAR16 *Path\r
   );\r
@@ -292,7 +290,6 @@ VerifyIntermediateDirectories (
   @return     non-zero if the strings are different.\r
 **/\r
 CONST CHAR16*\r
-EFIAPI\r
 StrniCmp(\r
   IN CONST CHAR16 *Source,\r
   IN CONST CHAR16 *Target,\r
@@ -310,7 +307,6 @@ StrniCmp(
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ShellLevel2StripQuotes (\r
   IN  CONST CHAR16     *OriginalString,\r
   OUT CHAR16           **CleanString\r
@@ -343,7 +339,6 @@ ShellCommandRunVol (
   @retval SHELL_SUCCESS   The source file was copied to the destination\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CopySingleFile(\r
   IN CONST CHAR16 *Source,\r
   IN CONST CHAR16 *Dest,\r
@@ -364,7 +359,6 @@ CopySingleFile(
   @retval SHELL_DEVICE_ERROR  A device error occured reading this Node.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 CascadeDelete(\r
   IN EFI_SHELL_FILE_INFO  *Node,\r
   IN CONST BOOLEAN        Quiet\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
index a6f0296d760363a511f4d35261ed2c9a9c9e81ac..f911c7eae86d57cdd20d8b348d2335cb242ad63b 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
@@ -27,7 +27,6 @@
   @retval SHELL_SUCCESS     The operation was sucessful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 HandleVol(\r
   IN CONST CHAR16  *Path,\r
   IN CONST BOOLEAN Delete,\r