zlib-streams 1.0.6 → 1.0.7

package/src/wasm/inflate9_stream_wasm.c

@@ -2,15 +2,9 @@
 #include <string.h>
 #include <stdint.h>
 #include "zlib.h"
-#include "inflate9.h"
 #include "wasm_stream_common.h"
-#ifndef DEFLATE64_WBITS
-#if defined(MAX_WBITS) && (MAX_WBITS >= 16)
-#define DEFLATE64_WBITS MAX_WBITS
-#else
+
 #define DEFLATE64_WBITS 16
-#endif
-#endif
 
 struct wasm_inflate9_ctx {
   WASM_STREAM_COMMON_FIELDS;
@@ -18,28 +12,22 @@ struct wasm_inflate9_ctx {
 
 unsigned inflate9_new(void) { return wasm_stream_new(); }
 
-int inflate9_init(unsigned zptr) {
-  struct wasm_inflate9_ctx *c = (struct wasm_inflate9_ctx *)(uintptr_t)zptr;
-  if (!c)
-    return Z_STREAM_ERROR;
-  return inflate9Init(&c->strm);
-}
-
 int inflate9_init_raw(unsigned zptr) {
   struct wasm_inflate9_ctx *c = (struct wasm_inflate9_ctx *)(uintptr_t)zptr;
   if (!c)
     return Z_STREAM_ERROR;
-  return inflate9Init2_(&c->strm, -DEFLATE64_WBITS, ZLIB_VERSION,
-                        (int)sizeof(z_stream));
+  return inflateInit2(&c->strm, -DEFLATE64_WBITS);
 }
 
+int inflate9_init(unsigned zptr) { return inflate9_init_raw(zptr); }
+
 int inflate9_process(unsigned zptr, unsigned in_ptr, unsigned in_len,
                      unsigned out_ptr, unsigned out_len, int flush) {
   return wasm_stream_process_common(zptr, in_ptr, in_len, out_ptr, out_len,
-                                    flush, inflate9);
+                                    flush, inflate);
 }
 
-int inflate9_end(unsigned zptr) { return wasm_stream_end(zptr, inflate9End); }
+int inflate9_end(unsigned zptr) { return wasm_stream_end(zptr, inflateEnd); }
 
 unsigned inflate9_last_consumed(unsigned zptr) {
   return wasm_stream_last_consumed(zptr);

package/tmp/all_runs/payload_decompress_nowindow_debug__100k_lines.deflate64.log

@@ -0,0 +1,34 @@
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=0 produced=65536
+inflate nowindow loop ret=1 produced=26202