MdeModulePkg: Update Brotli DecompressLib to the latest v1.0.6

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

diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c b/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
index 4b10b409761cd74ac03c8868ab85be2fc867ee35..6c72882dad594c4f71255029bf3816f87305d6d3 100644 (file)
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
@@ -122,14 +122,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 +140,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 +159,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 +167,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 +184,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