diff src/dmres.c @ 1121:043b5942fdb6

Rename some dmzlib functions and add context init/close functions.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Mar 2015 04:37:58 +0200
parents f8e9f6b2a41a
children 320dcfd1bd75
line wrap: on
line diff
--- a/src/dmres.c	Wed Mar 04 03:53:22 2015 +0200
+++ b/src/dmres.c	Wed Mar 04 04:37:58 2015 +0200
@@ -410,9 +410,10 @@
     }
 
     // Initialize decompression structures
+    if ((ret = dmZLibInitInflate(&ctx)) != DMERR_OK)
+        goto out;
     ctx.inBuffer     = ctx.inBufferStart = inBuf;
     ctx.inBufferEnd  = inBuf + node->length;
-
     ctx.outBuffer    = ctx.outBufferStart = handle->rawData;
     ctx.outBufferEnd = handle->rawData + node->size;
     ctx.expandable   = FALSE;
@@ -421,13 +422,14 @@
     if ((ret = dmZLibParseHeader(&ctx, TRUE)) != DMERR_OK)
         goto out;
 
-    if ((ret = dmZLibDecode(&ctx)) != DMERR_OK)
+    if ((ret = dmZLibInflate(&ctx)) != DMERR_OK)
         goto out;
 
     handle->rawData = ctx.outBufferStart;
     handle->rawSize = ctx.outBuffer - ctx.outBufferStart;
 
 out:
+    dmZLibCloseInflate(&ctx);
     dmFree(inBuf);
     return ret;
 }