From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 18AE321E1DAC4 for ; Mon, 7 Aug 2017 09:59:26 -0700 (PDT) Received: from G2W6310.americas.hpqcorp.net (g2w6310.austin.hp.com [16.197.64.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5008.houston.hpe.com (Postfix) with ESMTPS id 5D75E55 for ; Mon, 7 Aug 2017 17:01:41 +0000 (UTC) Received: from G4W9120.americas.hpqcorp.net (2002:10d2:150f::10d2:150f) by G2W6310.americas.hpqcorp.net (2002:10c5:4034::10c5:4034) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Mon, 7 Aug 2017 17:01:40 +0000 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (15.241.52.13) by G4W9120.americas.hpqcorp.net (16.210.21.15) with Microsoft SMTP Server (TLS) id 15.0.1178.4 via Frontend Transport; Mon, 7 Aug 2017 17:01:40 +0000 Received: from CS1PR84MB0151.NAMPRD84.PROD.OUTLOOK.COM (10.162.189.30) by CS1PR84MB0152.NAMPRD84.PROD.OUTLOOK.COM (10.162.190.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1320.16; Mon, 7 Aug 2017 17:01:39 +0000 Received: from CS1PR84MB0151.NAMPRD84.PROD.OUTLOOK.COM ([10.162.189.30]) by CS1PR84MB0151.NAMPRD84.PROD.OUTLOOK.COM ([10.162.189.30]) with mapi id 15.01.1320.018; Mon, 7 Aug 2017 17:01:39 +0000 From: "Palmer, Thomas" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" , "Kinney, Michael D" Thread-Topic: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI Thread-Index: AQHSGvNAoryjQusQeUigMru2XwtxjaJ04KVggAVsbxCAALkIYA== Date: Mon, 7 Aug 2017 17:01:39 +0000 Message-ID: References: <20160930081752.569916-1-ruiyu.ni@intel.com> <20160930081752.569916-6-ruiyu.ni@intel.com> <734D49CCEBEEF84792F5B80ED585239D5B9CE1E7@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5B9CE1E7@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=thomas.palmer@hpe.com; x-originating-ip: [15.203.227.4] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CS1PR84MB0152; 6:B9G8bFe0sm1d9aHfTNxg0lvV2Nxmtc9ijims+SsYu59vTHghvDN8+vqDWmZAKu69sAvWSJ0YYgvY6qB5vvnQ4NZ5aizk3Xa9hxzoigb+qM+d6nj9OltbvCVNwkFhkWIxDjybx6eDPQ4Qw5c4cYCEvyIJnUCts93VzP5GB000N7lSEGqUmmvKjdFBsRLBOk1obdvRTxELs0fTh2JD+UJMOEF19kOj1jQB6oP7ZZnIaYgV+CfSyJxsvM2cN9Q5Fqw21QrcAF0xQa7vrICOTbSZHJtsIcULB7xREM++fvP8JtGRi9BNbQtyouI+AJK0Qm+N1k++M6zkLVTKmHtjqvywlA==; 5:JR+acXC16G2JdxBC3oycIMwR3uFw7+Hl7CQRa2ApCPN63Pnggd5G61BT52DkJ0hOrxp1OdIXFzQxaM7IZelJLIYEkBHLB/z3fF5wmUUkmH+783dQnzVp4E+FWc0GIpuXdLm2vYvXN76NShsrlnyy7w==; 24:bj0o7LaEf5pxwMKfJbowgxsDx282P2xkTrzGRSqS89rFJTYTVaND+4B607ySraVQpylA9eF7rSDD7t2JiIoAJdYt38sqm1pSmu6vkIdrtgU=; 7:cpTPR2pZojhR+eJwwmv4+PUaOfm9Xzd/0zF3me3n4Dyr5uzAMXyz+wNjh2KDsLPSvWpV6b18zgXAv3rDX2wH/uWOnpclwp4RoWudIkMaebBIyhwlDBofcjSliyyn/48V86F/QkPwF8P1TMVjILxBHiwuElvVa583pOZETQegZIVY/1rgBlmD15uyYUWn5jGkppZWMxNFzYeb6MQ9bjBKnUd9eRlT36TwzVz6+rYStC4= x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: f23c74ff-327f-447b-bb18-08d4ddb5f858 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CS1PR84MB0152; x-ms-traffictypediagnostic: CS1PR84MB0152: x-exchange-antispam-report-test: UriScan:(227479698468861)(162533806227266)(21532816269658)(228905959029699); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CS1PR84MB0152; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CS1PR84MB0152; x-forefront-prvs: 0392679D18 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6009001)(39860400002)(39850400002)(39410400002)(39400400002)(39840400002)(39450400003)(199003)(189002)(13464003)(377454003)(478600001)(106356001)(2906002)(7736002)(305945005)(189998001)(53546010)(6506006)(102836003)(105586002)(966005)(25786009)(14454004)(3846002)(54356999)(6116002)(50986999)(97736004)(2950100002)(101416001)(77096006)(76176999)(6246003)(38730400002)(229853002)(53936002)(53946003)(5660300001)(86362001)(2501003)(93886004)(33656002)(9686003)(6306002)(7696004)(55016002)(6436002)(2900100001)(68736007)(66066001)(81166006)(74316002)(8936002)(8676002)(81156014)(3660700001)(3280700002)(15760500002)(403724002)(19627235001); DIR:OUT; SFP:1102; SCL:1; SRVR:CS1PR84MB0152; H:CS1PR84MB0151.NAMPRD84.PROD.OUTLOOK.COM; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: hpe.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2017 17:01:39.0372 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-Transport-CrossTenantHeadersStamped: CS1PR84MB0152 X-OriginatorOrg: hpe.com Subject: Re: [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remove unnecessary EFIAPI X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Aug 2017 16:59:26 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Ruiyu, I personally do not have a preference whether it has EFIAPI or not. But t= he declaration must be consistent with the implementation. When this funct= ion 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 bui= lds so consistency is important. =20 Does this have to remain an internal function? We could avoid this issue e= ntirely 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 mak= e it shorter" - Blaise Pascal -----Original Message----- From: Ni, Ruiyu [mailto:ruiyu.ni@intel.com]=20 Sent: Monday, August 7, 2017 12:57 AM To: Palmer, Thomas ; edk2-devel@lists.01.org; Kinney= , Michael D Subject: RE: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: Remo= ve unnecessary EFIAPI Because an internal function doesn't need to have EFIAPI prefix. I think a proper fix is to change both BaseLib and UefiShellLevel2CommandsL= ib 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=20 > Palmer, Thomas > Sent: Friday, August 4, 2017 3:07 AM > To: Ni, Ruiyu ; edk2-devel@lists.01.org > Subject: Re: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: > Remove unnecessary EFIAPI >=20 > Ruiyu, > Sorry for replying to old patch, I was cleaning out some old=20 > sandboxes when I stumbled onto this issue. >=20 > Why is EFIAPI removed from InternalCharToUpper in=20 > UefiShellLevel2CommandsLib.c? It is present in both BaseLibInternals.h a= nd > String.c. Without EFIAPI, GCC builds of this function can fail >=20 >=20 > Regards, >=20 > Thomas Palmer >=20 > "I have only made this letter longer because I have not had the time=20 > to make it shorter" - Blaise Pascal >=20 >=20 > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of=20 > Ruiyu Ni > Sent: Friday, September 30, 2016 3:18 AM > To: edk2-devel@lists.01.org > Cc: Ruiyu Ni ; Jaben Carsey=20 > ; Chen A Chen > Subject: [edk2] [PATCH 05/11] ShellPkg/UefiShellLevel2CommandsLib: > Remove unnecessary EFIAPI >=20 > From: Ruiyu Ni >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Chen A Chen > Cc: Jaben Carsey > Cc: Ruiyu Ni > --- > 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(-) >=20 > 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 @@ >=20 > **/ > EFI_STATUS > -EFIAPI > ConnectAllEfi ( > VOID > ) > @@ -74,7 +73,6 @@ ConnectAllEfi ( > @retval EFI_OUT_OF_RESOURCES there was insufficient memory **/=20 > 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( >=20 > **/ > VOID > -EFIAPI > PrintFileInformation( > IN CONST BOOLEAN Sfo, > IN CONST EFI_SHELL_FILE_INFO *TheNode, @@ -263,7 +261,6 @@=20 > 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 s= torage. > **/ > 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[] =3D L"F*"; >=20 > **/ > 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( >=20 > **/ > SHELL_STATUS > -EFIAPI > AddMappingFromMapping( > IN CONST CHAR16 *Map, > IN CONST CHAR16 *SName > @@ -931,7 +920,6 @@ AddMappingFromMapping( >=20 > **/ > 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 re= quired. > **/ > 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[] =3D { > @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=20 > 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=20 > 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[] =3D { > @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[]=20 > =3D { > @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 >=20 > _______________________________________________ > 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