ShellPkg/UefiShellDebug1CommandsLib: 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>

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,

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,

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

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,

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
   )

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
   );

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
   )

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
   );

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
   )

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
   );

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
   )

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
   );

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
   )

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
   );

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
   )

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
   );

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,

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,

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

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