mirror of
https://github.com/acidanthera/audk.git
synced 2025-04-08 17:05:09 +02:00
3dbf922901
"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 f8d0b9662993 ("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 c4e74e9b814c
("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: c4e74e9b814cfb4b51cf832f3bb218cd2aba348b
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>
40 lines
1.3 KiB
C
40 lines
1.3 KiB
C
/** @file
|
|
Header file for compression routine.
|
|
|
|
Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>
|
|
This program and the accompanying materials
|
|
are licensed and made available under the terms and conditions of the BSD License
|
|
which accompanies this distribution. The full text of the license may be found at
|
|
http://opensource.org/licenses/bsd-license.php
|
|
|
|
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
|
|
**/
|
|
|
|
#ifndef _EFI_SHELL_COMPRESS_H_
|
|
#define _EFI_SHELL_COMPRESS_H_
|
|
|
|
/**
|
|
The compression routine.
|
|
|
|
@param[in] SrcBuffer The buffer containing the source data.
|
|
@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.
|
|
|
|
@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
|
|
);
|
|
|
|
#endif
|
|
|