Mercurial > hg > dmlib
diff src/dmzlib.c @ 1074:e98bc627ad08
Rename dmzlib structure members.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 02 Mar 2015 04:13:56 +0200 |
parents | f317e34246db |
children | 97ccd6d972ff |
line wrap: on
line diff
--- a/src/dmzlib.c Mon Mar 02 04:01:26 2015 +0200 +++ b/src/dmzlib.c Mon Mar 02 04:13:56 2015 +0200 @@ -157,10 +157,10 @@ static inline Uint8 dmZGet8(DMZLibContext * ctx) { - if (ctx->zbuffer >= ctx->zbufferEnd) + if (ctx->inBuffer >= ctx->inBufferEnd) return 0; - return *ctx->zbuffer++; + return *ctx->inBuffer++; } @@ -243,12 +243,12 @@ } -static int dmZLibExpand(DMZLibContext * ctx, Uint8 *zout, size_t n) +static int dmZLibExpand(DMZLibContext * ctx, Uint8 *outBuffer, size_t n) { Uint8 *newBuf; size_t cur, limit; - ctx->zout = zout; + ctx->outBuffer = outBuffer; if (!ctx->expandable) { @@ -256,21 +256,21 @@ "Output buffer limit hit, and is not expandable.\n"); } - cur = ctx->zout - ctx->zoutStart; - limit = ctx->zoutEnd - ctx->zoutStart; + cur = ctx->outBuffer - ctx->outBufferStart; + limit = ctx->outBufferEnd - ctx->outBufferStart; while (cur + n > limit) limit *= 2; - if ((newBuf = (Uint8 *) dmRealloc(ctx->zoutStart, limit)) == NULL) + if ((newBuf = (Uint8 *) dmRealloc(ctx->outBufferStart, limit)) == NULL) { return dmErrorDBG(DMERR_MALLOC, "Could not reallocate buffer.\n"); } - ctx->zoutStart = newBuf; - ctx->zout = newBuf + cur; - ctx->zoutEnd = newBuf + limit; + ctx->outBufferStart = newBuf; + ctx->outBuffer = newBuf + cur; + ctx->outBufferEnd = newBuf + limit; return DMERR_OK; } @@ -305,7 +305,7 @@ static int dmZLibParseHuffmanBlock(DMZLibContext * ctx) { - Uint8 *zout = ctx->zout; + Uint8 *outBuffer = ctx->outBuffer; for (;;) { int z, ret; @@ -314,14 +314,14 @@ if (z < 256) { - if (zout >= ctx->zoutEnd) + if (outBuffer >= ctx->outBufferEnd) { - if ((ret = dmZLibExpand(ctx, zout, 1)) != DMERR_OK) + if ((ret = dmZLibExpand(ctx, outBuffer, 1)) != DMERR_OK) return ret; - zout = ctx->zout; + outBuffer = ctx->outBuffer; } - *zout++ = (Uint8) z; + *outBuffer++ = (Uint8) z; } else { @@ -329,7 +329,7 @@ int len, dist; if (z == 256) { - ctx->zout = zout; + ctx->outBuffer = outBuffer; return DMERR_OK; } @@ -346,27 +346,27 @@ if (dm_zlib_dist_extra[z]) dist += dmZReceive(ctx, dm_zlib_dist_extra[z]); - if (zout - ctx->zoutStart < dist) + if (outBuffer - ctx->outBufferStart < dist) { return dmErrorDBG(DMERR_DATA_ERROR, "Bad Huffman block distance.\n"); } - if (zout + len > ctx->zoutEnd) + if (outBuffer + len > ctx->outBufferEnd) { - if ((ret = dmZLibExpand(ctx, zout, len)) != DMERR_OK) + if ((ret = dmZLibExpand(ctx, outBuffer, len)) != DMERR_OK) return ret; - zout = ctx->zout; + outBuffer = ctx->outBuffer; } - p = (Uint8 *) (zout - dist); + p = (Uint8 *) (outBuffer - dist); if (dist == 1) { // run of one byte; common in images. Uint8 v = *p; - do { *zout++ = v; } while (--len); + do { *outBuffer++ = v; } while (--len); } else { - do { *zout++ = *p++; } while (--len); + do { *outBuffer++ = *p++; } while (--len); } } } @@ -494,7 +494,7 @@ if (ctx->numBits & 7) dmZReceive(ctx, ctx->numBits & 7); - // drain the bit-packed data into header + // Get the bit-packed data into header k = 0; while (ctx->numBits > 0) { @@ -520,23 +520,23 @@ if (len > 0) { - if (ctx->zbuffer + len > ctx->zbufferEnd) - { - return dmErrorDBG(DMERR_BOUNDS, - "Read past buffer, probably corrupt compressed data.\n"); - } + if (ctx->inBuffer + len > ctx->inBufferEnd) + { + return dmErrorDBG(DMERR_BOUNDS, + "Read past buffer, probably corrupt compressed data.\n"); + } - if (ctx->zout + len > ctx->zoutEnd && - (ret = dmZLibExpand(ctx, ctx->zout, len)) != DMERR_OK) - { - return dmErrorDBG(DMERR_DATA_ERROR, - "Could not expand output buffer: %d, %s\n", - ret, dmErrorStr(ret)); - } + if (ctx->outBuffer + len > ctx->outBufferEnd && + (ret = dmZLibExpand(ctx, ctx->outBuffer, len)) != DMERR_OK) + { + return dmErrorDBG(DMERR_DATA_ERROR, + "Could not expand output buffer: %d, %s\n", + ret, dmErrorStr(ret)); + } - memcpy(ctx->zout, ctx->zbuffer, len); - ctx->zbuffer += len; - ctx->zout += len; + memcpy(ctx->outBuffer, ctx->inBuffer, len); + ctx->inBuffer += len; + ctx->outBuffer += len; } return DMERR_OK;