tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg/UefiShellDebug1CommandsLib: sync Compress() definition with decl. 

"Compress.h" declares the Compress() function as EFIAPI, but the
definition in "Compress.c" lacks EFIAPI.

GCC toolchains without LTO do not catch this error because "Compress.c"
does not include "Compress.h"; i.e. the declaration used by callers such
as "EfiCompress.c" is not actually matched against the function definition
at build time.

With LTO enabled, the mismatch is found -- however, as a warning only, due
to commit f8d0b96629 ("BaseTools GCC5: disable warnings-as-errors for
now", 2016-08-03).

Include the header in the C file (which turns the issue into a hard build
error on all GCC toolchains), plus sync the declaration from the header
file to the C file. Finally, remove EFIAPI from both declaration and
definition -- this was the original intent of commit c4e74e9b81
("ShellPkg/UefiShellDebug1CommandsLib: Remove unnecessary EFIAPI",
2016-10-09), but it missed the header file.

(Gary meant to address that omission in Oct 2017:

  [edk2] [PATCH] ShellPkg/UefiShellDebug1CommandsLib: Remove EFIAPI from
                 Compress()

  http://mid.mail-archive.com/20171026065329.32311-1-glin@suse.com

and Ray reviewed the patch, but then the patch was never committed.)

So do the sync and drop EFIAPI now.

This happens to fix the EFICOMPRESS shell command, when built with GCC for
X64.

Cc: Gary Lin <glin@suse.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Fixes: c4e74e9b81
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gary Lin <glin@suse.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Laszlo Ersek 2018-02-06 22:08:07 +01:00
parent de8373fa07
commit 3dbf922901
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.c
View File

@ -23,6 +23,8 @@
#include <Library/DebugLib.h>
#include <Library/ShellLib.h>
#include "Compress.h"
//
// Macro Definitions
//
@ -1307,20 +1309,20 @@ Encode (
The compression routine.
@param[in] SrcBuffer The buffer containing the source data.
@param[in] SrcSize The number of bytes in SrcBuffer.
@param[in] SrcSize Number of bytes in SrcBuffer.
@param[in] DstBuffer The buffer to put the compressed image in.
@param[in, out] DstSize On input the size (in bytes) of DstBuffer, on
return the number of bytes placed in DstBuffer.
return the number of bytes placed in DstBuffer.
@retval EFI_SUCCESS The compression was sucessful.
@retval EFI_BUFFER_TOO_SMALL The buffer was too small. DstSize is required.
**/
EFI_STATUS
Compress (
IN VOID *SrcBuffer,
IN UINT64 SrcSize,
IN VOID *DstBuffer,
IN OUT UINT64 *DstSize
IN VOID *SrcBuffer,
IN UINT64 SrcSize,
IN VOID *DstBuffer,
IN OUT UINT64 *DstSize
)
{
EFI_STATUS Status;

1
ShellPkg/Library/UefiShellDebug1CommandsLib/Compress.h
View File

@ -28,7 +28,6 @@
@retval EFI_BUFFER_TOO_SMALL The buffer was too small. DstSize is required.
**/
EFI_STATUS
EFIAPI
Compress (
IN VOID *SrcBuffer,
IN UINT64 SrcSize,