dmlib: src/dmzlib.c comparison

comparison 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

comparison

equal deleted inserted replaced

-:f317e34246db
+:e98bc627ad08
 }
 static inline Uint8 dmZGet8(DMZLibContext * ctx)
 {
-if (ctx->zbuffer >= ctx->zbufferEnd)
+if (ctx->inBuffer >= ctx->inBufferEnd)
 return 0;
-return *ctx->zbuffer++;
+return *ctx->inBuffer++;
 }
 static void dmZFillBits(DMZLibContext * ctx)
 {
 return dmZLibHuffmanDecodeSlow(ctx, huff, val);
 }
-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)
 {
 return dmErrorDBG(DMERR_BOUNDS,
 "Output buffer limit hit, and is not expandable.\n");
 }
-cur   = ctx->zout - ctx->zoutStart;
+cur   = ctx->outBuffer - ctx->outBufferStart;
-limit = ctx->zoutEnd - ctx->zoutStart;
+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->outBufferStart = newBuf;
-ctx->zout      = newBuf + cur;
+ctx->outBuffer      = newBuf + cur;
-ctx->zoutEnd   = newBuf + limit;
+ctx->outBufferEnd   = newBuf + limit;
 return DMERR_OK;
 }
 };
 static int dmZLibParseHuffmanBlock(DMZLibContext * ctx)
 {
-Uint8 *zout = ctx->zout;
+Uint8 *outBuffer = ctx->outBuffer;
 for (;;)
 {
 int z, ret;
 if ((ret = dmZLibHuffmanDecode(ctx, &ctx->zlength, &z)) != DMERR_OK)
 return ret;
 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
 {
 Uint8 *p;
 int len, dist;
 if (z == 256)
 {
-ctx->zout = zout;
+ctx->outBuffer = outBuffer;
 return DMERR_OK;
 }
 z -= 257;
 dist = dm_zlib_dist_base[z];
 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);
 }
 }
 }
 }
 // "Any bits of input up to the next byte boundary are ignored."
 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)
 {
 header[k++] = (Uint8) (ctx->codeBuffer & 255);   // suppress MSVC run-time check
 ctx->codeBuffer >>= 8;
 nlen, len, len ^ 0xffff);
 }
 if (len > 0)
 {
-if (ctx->zbuffer + len > ctx->zbufferEnd)
+if (ctx->inBuffer + len > ctx->inBufferEnd)
 {
 return dmErrorDBG(DMERR_BOUNDS,
 "Read past buffer, probably corrupt compressed data.\n");
 }
-if (ctx->zout + len > ctx->zoutEnd &&
+if (ctx->outBuffer + len > ctx->outBufferEnd &&
-(ret = dmZLibExpand(ctx, ctx->zout, len)) != DMERR_OK)
+(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);
+memcpy(ctx->outBuffer, ctx->inBuffer, len);
-ctx->zbuffer += len;
+ctx->inBuffer  += len;
-ctx->zout    += len;
+ctx->outBuffer += len;
 }
 return DMERR_OK;
 }

Mercurial > hg > dmlib

comparison src/dmzlib.c @ 1074:e98bc627ad08