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

MdeModulePkg BrotliLib: Rename function with the specific lib name 

This change is to avoid the function conflict.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Liming Gao 2018-03-13 15:58:21 +08:00
parent 89b1612fcf
commit 792ace0ac3
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Brotli Decompress interfaces Brotli Decompress interfaces
Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -17,7 +17,7 @@
Dummy malloc function for compiler. Dummy malloc function for compiler.
**/ **/
VOID * VOID *
malloc ( BrDummyMalloc (
IN size_t Size IN size_t Size
) )
{ {
@ -29,7 +29,7 @@ malloc (
Dummy free function for compiler. Dummy free function for compiler.
**/ **/
VOID VOID
free ( BrDummyFree (
IN VOID * Ptr IN VOID * Ptr
) )
{ {
@ -198,7 +198,7 @@ BrotliDecompress (
@return The size of the uncompressed buffer. @return The size of the uncompressed buffer.
**/ **/
UINT64 UINT64
GetDecodedSizeOfBuf( BrGetDecodedSizeOfBuf(
IN UINT8 * EncodedData, IN UINT8 * EncodedData,
IN UINT8 StartOffset, IN UINT8 StartOffset,
IN UINT8 EndOffset IN UINT8 EndOffset
@ -259,10 +259,10 @@ BrotliUefiDecompressGetInfo (
ASSERT(SourceSize >= BROTLI_SCRATCH_MAX); ASSERT(SourceSize >= BROTLI_SCRATCH_MAX);
MaxOffset = BROTLI_DECODE_MAX; MaxOffset = BROTLI_DECODE_MAX;
GetSize = GetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset); GetSize = BrGetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);
*DestinationSize = (UINT32)GetSize; *DestinationSize = (UINT32)GetSize;
MaxOffset = BROTLI_SCRATCH_MAX; MaxOffset = BROTLI_SCRATCH_MAX;
GetSize = GetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset); GetSize = BrGetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);
*ScratchSize = (UINT32)GetSize; *ScratchSize = (UINT32)GetSize;
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -305,7 +305,7 @@ BrotliUefiDecompress (
UINT8 MaxOffset; UINT8 MaxOffset;
MaxOffset = BROTLI_SCRATCH_MAX; MaxOffset = BROTLI_SCRATCH_MAX;
GetSize = GetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset); GetSize = BrGetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);
BroBuff.Buff = Scratch; BroBuff.Buff = Scratch;
BroBuff.BuffSize = (UINTN)GetSize; BroBuff.BuffSize = (UINTN)GetSize;

6
MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLibInternal.h
View File

@ -3,7 +3,7 @@
Allows BROTLI code to build under UEFI (edk2) build environment Allows BROTLI code to build under UEFI (edk2) build environment
Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -41,12 +41,12 @@ typedef struct
#define memset(dest,ch,count) SetMem(dest,(UINTN)(count),(UINT8)(ch)) #define memset(dest,ch,count) SetMem(dest,(UINTN)(count),(UINT8)(ch))
VOID * VOID *
malloc ( BrDummyMalloc (
IN size_t Size IN size_t Size
); );
VOID VOID
free ( BrDummyFree (
IN VOID * Ptr IN VOID * Ptr
); );

2
MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c
View File

@ -56,7 +56,7 @@ BrotliDecoderState* BrotliDecoderCreateInstance(
brotli_alloc_func alloc_func, brotli_free_func free_func, void* opaque) { brotli_alloc_func alloc_func, brotli_free_func free_func, void* opaque) {
BrotliDecoderState* state = 0; BrotliDecoderState* state = 0;
if (!alloc_func && !free_func) { if (!alloc_func && !free_func) {
state = (BrotliDecoderState*)malloc(sizeof(BrotliDecoderState)); state = (BrotliDecoderState*)BrDummyMalloc(sizeof(BrotliDecoderState));
} else if (alloc_func && free_func) { } else if (alloc_func && free_func) {
state = (BrotliDecoderState*)alloc_func(opaque, sizeof(BrotliDecoderState)); state = (BrotliDecoderState*)alloc_func(opaque, sizeof(BrotliDecoderState));
} }

4
MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.c
View File

@ -18,12 +18,12 @@ extern "C" {
static void* DefaultAllocFunc(void* opaque, size_t size) { static void* DefaultAllocFunc(void* opaque, size_t size) {
BROTLI_UNUSED(opaque); BROTLI_UNUSED(opaque);
return malloc(size); return BrDummyMalloc(size);
} }
static void DefaultFreeFunc(void* opaque, void* address) { static void DefaultFreeFunc(void* opaque, void* address) {
BROTLI_UNUSED(opaque); BROTLI_UNUSED(opaque);
free(address); BrDummyFree(address);
} }
void BrotliDecoderStateInit(BrotliDecoderState* s) { void BrotliDecoderStateInit(BrotliDecoderState* s) {