Forgot to rename the decoder custom dictionary func

[io-compress-brotli.git] / Brotli.xs

diff --git a/Brotli.xs b/Brotli.xs
index 60b6428c3728c2a67c4e684b80d71c5470151c38..a14b828c089dc170df4e576f32b2d8da4b7b3fbb 100644 (file)
--- a/Brotli.xs
+++ b/Brotli.xs
@@ -6,6 +6,7 @@
 #include "ppport.h"
 
 #include <dec/decode.h>
+#include <common/dictionary.h>
 
 #define BUFFER_SIZE 1048576
 static uint8_t buffer[BUFFER_SIZE]; /* It's almost 2016, is anyone still using ithreads? */
@@ -26,32 +27,32 @@ SV* unbro(buffer)
     }
     Newx(decoded_buffer, decoded_size+1, uint8_t);
     decoded_buffer[decoded_size]=0;
-    if(!BrotliDecompressBuffer(encoded_size, encoded_buffer, &decoded_size, decoded_buffer)){
-        croak("Error in BrotliDecompressBuffer");
+    if(!BrotliDecoderDecompress(encoded_size, encoded_buffer, &decoded_size, decoded_buffer)){
+        croak("Error in BrotliDecoderDecompress");
     }
     RETVAL = newSV(0);
     sv_usepvn_flags(RETVAL, decoded_buffer, decoded_size, SV_HAS_TRAILING_NUL);
   OUTPUT:
     RETVAL
 
-SV* BrotliCreateState()
+SV* BrotliDecoderCreateInstance()
   CODE:
-    RETVAL = newSViv((IV)BrotliCreateState(NULL, NULL, NULL));
+    RETVAL = newSViv((IV)BrotliDecoderCreateInstance(NULL, NULL, NULL));
   OUTPUT:
     RETVAL
 
-void BrotliDestroyState(state)
+void BrotliDecoderDestroyInstance(state)
     SV* state
   CODE:
-    BrotliDestroyState((BrotliState*)SvIV(state));
+    BrotliDecoderDestroyInstance((BrotliDecoderState*)SvIV(state));
 
-SV* BrotliDecompressStream(state, in)
+SV* BrotliDecoderDecompressStream(state, in)
     SV* state
     SV* in
   PREINIT:
     uint8_t *next_in, *next_out;
     size_t available_in, available_out, total_out;
-    BrotliResult result;
+    BrotliDecoderResult result;
   CODE:
     next_in = (uint8_t*) SvPV(in, available_in);
     RETVAL = newSVpv("", 0);
@@ -59,16 +60,16 @@ SV* BrotliDecompressStream(state, in)
     while(result == BROTLI_RESULT_NEEDS_MORE_OUTPUT) {
         next_out = buffer;
         available_out=BUFFER_SIZE;
-        result = BrotliDecompressStream(&available_in, (const uint8_t**) &next_in, &available_out, &next_out, &total_out, (BrotliState*) SvIV(state));
+        result = BrotliDecoderDecompressStream((BrotliDecoderState*) SvIV(state), &available_in, (const uint8_t**) &next_in, &available_out, &next_out, &total_out);
         if(!result){
-             croak("Error in BrotliDecompressStream");
+             croak("Error in BrotliDecoderDecompressStream");
         }
         sv_catpvn(RETVAL, (const char*)buffer, BUFFER_SIZE-available_out);
     }
   OUTPUT:
     RETVAL
 
-void BrotliSetCustomDictionary(state, dict)
+void BrotliDecoderSetCustomDictionary(state, dict)
     SV* state
     SV* dict
   PREINIT:
@@ -76,4 +77,4 @@ void BrotliSetCustomDictionary(state, dict)
     uint8_t *data;
   CODE:
     data = SvPV(dict, size);
-    BrotliSetCustomDictionary(size, data, (BrotliState*) SvIV(state));
+    BrotliDecoderSetCustomDictionary((BrotliDecoderState*) SvIV(state), size, data);