X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ac69049ec2c354299b260fb859d029609fba91e5..687c6b14a01fb462ded54fbf0da5bb4443251f48:/zlib/infblock.c diff --git a/zlib/infblock.c b/zlib/infblock.c index 96a7a265..38f90fc8 100644 --- a/zlib/infblock.c +++ b/zlib/infblock.c @@ -176,7 +176,7 @@ int r; break; case 3: /* illegal */ DUMPBITS(3) - s->mode = zBAD; + s->mode = BAD; z->msg = (char*)"invalid block type"; r = Z_DATA_ERROR; LEAVE @@ -186,7 +186,7 @@ int r; NEEDBITS(32) if ((((~b) >> 16) & 0xffff) != (b & 0xffff)) { - s->mode = zBAD; + s->mode = BAD; z->msg = (char*)"invalid stored block lengths"; r = Z_DATA_ERROR; LEAVE @@ -219,7 +219,7 @@ int r; #ifndef PKZIP_BUG_WORKAROUND if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29) { - s->mode = zBAD; + s->mode = BAD; z->msg = (char*)"too many length or distance symbols"; r = Z_DATA_ERROR; LEAVE @@ -251,10 +251,10 @@ int r; { r = t; if (r == Z_DATA_ERROR) - { - ZFREE(z, s->sub.trees.blens); - s->mode = zBAD; - } + { + ZFREE(z, s->sub.trees.blens); + s->mode = BAD; + } LEAVE } s->sub.trees.index = 0; @@ -291,7 +291,7 @@ int r; (c == 16 && i < 1)) { ZFREE(z, s->sub.trees.blens); - s->mode = zBAD; + s->mode = BAD; z->msg = (char*)"invalid bit length repeat"; r = Z_DATA_ERROR; LEAVE @@ -318,14 +318,14 @@ int r; if (t != Z_OK) { if (t == (uInt)Z_DATA_ERROR) - { - ZFREE(z, s->sub.trees.blens); - s->mode = zBAD; - } + { + ZFREE(z, s->sub.trees.blens); + s->mode = BAD; + } r = t; LEAVE } - ZFREE(z, s->sub.trees.blens); + ZFREE(z, s->sub.trees.blens); Tracev((stderr, "inflate: trees ok\n")); if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL) { @@ -359,7 +359,7 @@ int r; case DONE: r = Z_STREAM_END; LEAVE - case zBAD: + case BAD: r = Z_DATA_ERROR; LEAVE default: