# HG changeset patch # User Matti Hamalainen # Date 1425171739 -7200 # Node ID b3b8794c4915b3437bc04a6d085600f7b15688ec # Parent 4a68f8d0adc58cd250e0aac2d5690a385b3ee16e Rename a function argument. diff -r 4a68f8d0adc5 -r b3b8794c4915 src/dmzlib.c --- a/src/dmzlib.c Sun Mar 01 03:00:12 2015 +0200 +++ b/src/dmzlib.c Sun Mar 01 03:02:19 2015 +0200 @@ -349,23 +349,23 @@ }; -static int dmZLibComputeHuffmanCodes(DMZLibContext * a) +static int dmZLibComputeHuffmanCodes(DMZLibContext * ctx) { DMZHuffmanContext z_codelength; Uint8 codeLengths[286 + 32 + 137]; //padding for maximum single op Uint8 codeLengthSizes[19]; int i, n, ret; - int hlit = dmZReceive(a, 5) + 257; - int hdist = dmZReceive(a, 5) + 1; - int hclen = dmZReceive(a, 4) + 4; + int hlit = dmZReceive(ctx, 5) + 257; + int hdist = dmZReceive(ctx, 5) + 1; + int hclen = dmZReceive(ctx, 4) + 4; memset(codeLengthSizes, 0, sizeof(codeLengthSizes)); for (i = 0; i < hclen; i++) { - int s = dmZReceive(a, 3); codeLengthSizes[length_dezigzag[i]] = (Uint8) s; + int s = dmZReceive(ctx, 3); } if ((ret = dmZLibBuildHuffmanTables(&z_codelength, codeLengthSizes, 19)) != DMERR_OK) @@ -375,7 +375,7 @@ while (n < hlit + hdist) { int c; - if ((ret = dmZLibHuffmanDecode(a, &z_codelength, &c)) != DMERR_OK) + if ((ret = dmZLibHuffmanDecode(ctx, &z_codelength, &c)) != DMERR_OK) return ret; DMSTBI_ASSERT(c >= 0 && c < 19); @@ -385,20 +385,20 @@ else if (c == 16) { - c = dmZReceive(a, 2) + 3; + c = dmZReceive(ctx, 2) + 3; memset(codeLengths + n, codeLengths[n - 1], c); n += c; } else if (c == 17) { - c = dmZReceive(a, 3) + 3; + c = dmZReceive(ctx, 3) + 3; memset(codeLengths + n, 0, c); n += c; } else { - c = dmZReceive(a, 7) + 11; + c = dmZReceive(ctx, 7) + 11; memset(codeLengths + n, 0, c); n += c; } @@ -410,10 +410,10 @@ "Bad huffman codelengths.\n"); } - if ((ret = dmZLibBuildHuffmanTables(&a->zlength, codeLengths, hlit)) != DMERR_OK) + if ((ret = dmZLibBuildHuffmanTables(&ctx->zlength, codeLengths, hlit)) != DMERR_OK) return ret; - if ((ret = dmZLibBuildHuffmanTables(&a->zdistance, codeLengths + hlit, hdist)) != DMERR_OK) + if ((ret = dmZLibBuildHuffmanTables(&ctx->zdistance, codeLengths + hlit, hdist)) != DMERR_OK) return ret; return DMERR_OK;