MdeModulePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdeModulePkg / Library / BrotliCustomDecompressLib / BrotliDecompress.c

diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c b/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
index a30392148f94dcb1f573cdbd03189d61c62d054e..512518699e4cd51858cddf7d150af4eb137a1190 100644 (file)
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
@@ -1,14 +1,8 @@
 /** @file\r
   Brotli Decompress interfaces\r
 \r
-  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 #include <BrotliDecompressLibInternal.h>\r
@@ -17,7 +11,7 @@
   Dummy malloc function for compiler.\r
 **/\r
 VOID *\r
-malloc (\r
+BrDummyMalloc (\r
   IN size_t    Size\r
   )\r
 {\r
@@ -29,7 +23,7 @@ malloc (
   Dummy free function for compiler.\r
 **/\r
 VOID\r
-free (\r
+BrDummyFree (\r
   IN VOID *    Ptr\r
   )\r
 {\r
@@ -122,14 +116,14 @@ BrotliDecompress (
   size_t         TotalOut;\r
   size_t         AvailableIn;\r
   size_t         AvailableOut;\r
-  BrotliResult   Result;\r
-  BrotliState *  BroState;\r
   VOID *         Temp;\r
+  BrotliDecoderResult   Result;\r
+  BrotliDecoderState *  BroState;\r
 \r
   TotalOut = 0;\r
   AvailableOut = FILE_BUFFER_SIZE;\r
-  Result = BROTLI_RESULT_ERROR;\r
-  BroState = BrotliCreateState(BrAlloc, BrFree, BuffInfo);\r
+  Result = BROTLI_DECODER_RESULT_ERROR;\r
+  BroState = BrotliDecoderCreateInstance(BrAlloc, BrFree, BuffInfo);\r
   Temp = Destination;\r
 \r
   if (BroState == NULL) {\r
@@ -140,13 +134,13 @@ BrotliDecompress (
   if ((Input==NULL) || (Output==NULL)) {\r
     BrFree(BuffInfo, Input);\r
     BrFree(BuffInfo, Output);\r
-    BrotliDestroyState(BroState);\r
+    BrotliDecoderDestroyInstance(BroState);\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   NextOut = Output;\r
-  Result = BROTLI_RESULT_NEEDS_MORE_INPUT;\r
+  Result = BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;\r
   while (1) {\r
-    if (Result == BROTLI_RESULT_NEEDS_MORE_INPUT) {\r
+    if (Result == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT) {\r
       if (SourceSize == 0) {\r
         break;\r
       }\r
@@ -159,7 +153,7 @@ BrotliDecompress (
       Source = (VOID *)((UINT8 *)Source + AvailableIn);\r
       SourceSize -= AvailableIn;\r
       NextIn = Input;\r
-    } else if (Result == BROTLI_RESULT_NEEDS_MORE_OUTPUT) {\r
+    } else if (Result == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {\r
       CopyMem(Temp, Output, FILE_BUFFER_SIZE);\r
       AvailableOut = FILE_BUFFER_SIZE;\r
       Temp = (VOID *)((UINT8 *)Temp +FILE_BUFFER_SIZE);\r
@@ -167,13 +161,13 @@ BrotliDecompress (
     } else {\r
       break; /* Error or success. */\r
     }\r
-    Result = BrotliDecompressStream(\r
+    Result = BrotliDecoderDecompressStream(\r
+                          BroState,\r
                           &AvailableIn,\r
                           &NextIn,\r
                           &AvailableOut,\r
                           &NextOut,\r
-                          &TotalOut,\r
-                          BroState\r
+                          &TotalOut\r
                           );\r
   }\r
   if (NextOut != Output) {\r
@@ -184,8 +178,8 @@ BrotliDecompress (
 \r
   BrFree(BuffInfo, Input);\r
   BrFree(BuffInfo, Output);\r
-  BrotliDestroyState(BroState);\r
-  return (Result == BROTLI_RESULT_SUCCESS) ? EFI_SUCCESS : EFI_INVALID_PARAMETER;\r
+  BrotliDecoderDestroyInstance(BroState);\r
+  return (Result == BROTLI_DECODER_RESULT_SUCCESS) ? EFI_SUCCESS : EFI_INVALID_PARAMETER;\r
 }\r
 \r
 /**\r
@@ -198,7 +192,7 @@ BrotliDecompress (
   @return The size of the uncompressed buffer.\r
 **/\r
 UINT64\r
-GetDecodedSizeOfBuf(\r
+BrGetDecodedSizeOfBuf(\r
   IN UINT8 *  EncodedData,\r
   IN UINT8    StartOffset,\r
   IN UINT8    EndOffset\r
@@ -259,10 +253,10 @@ BrotliUefiDecompressGetInfo (
   ASSERT(SourceSize >= BROTLI_SCRATCH_MAX);\r
 \r
   MaxOffset = BROTLI_DECODE_MAX;\r
-  GetSize = GetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);\r
+  GetSize = BrGetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);\r
   *DestinationSize = (UINT32)GetSize;\r
   MaxOffset = BROTLI_SCRATCH_MAX;\r
-  GetSize = GetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);\r
+  GetSize = BrGetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);\r
   *ScratchSize = (UINT32)GetSize;\r
   return EFI_SUCCESS;\r
 }\r
@@ -305,7 +299,7 @@ BrotliUefiDecompress (
   UINT8          MaxOffset;\r
 \r
   MaxOffset = BROTLI_SCRATCH_MAX;\r
-  GetSize = GetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);\r
+  GetSize = BrGetDecodedSizeOfBuf((UINT8 *)Source, MaxOffset - BROTLI_INFO_SIZE, MaxOffset);\r
 \r
   BroBuff.Buff     = Scratch;\r
   BroBuff.BuffSize = (UINTN)GetSize;\r