Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The --progress output now leaves the cursor at the end of the line
[rsync/rsync.git]
/
zlib
/
inflate.c
diff --git
a/zlib/inflate.c
b/zlib/inflate.c
index
792fdee
..
fd5ae4f
100644
(file)
--- a/
zlib/inflate.c
+++ b/
zlib/inflate.c
@@
-649,6
+649,7
@@
int flush;
if (state->flags & 0x0200) CRC2(state->check, hold);
INITBITS();
state->mode = TIME;
if (state->flags & 0x0200) CRC2(state->check, hold);
INITBITS();
state->mode = TIME;
+ /* FALL THROUGH */
case TIME:
NEEDBITS(32);
if (state->head != Z_NULL)
case TIME:
NEEDBITS(32);
if (state->head != Z_NULL)
@@
-656,6
+657,7
@@
int flush;
if (state->flags & 0x0200) CRC4(state->check, hold);
INITBITS();
state->mode = OS;
if (state->flags & 0x0200) CRC4(state->check, hold);
INITBITS();
state->mode = OS;
+ /* FALL THROUGH */
case OS:
NEEDBITS(16);
if (state->head != Z_NULL) {
case OS:
NEEDBITS(16);
if (state->head != Z_NULL) {
@@
-665,6
+667,7
@@
int flush;
if (state->flags & 0x0200) CRC2(state->check, hold);
INITBITS();
state->mode = EXLEN;
if (state->flags & 0x0200) CRC2(state->check, hold);
INITBITS();
state->mode = EXLEN;
+ /* FALL THROUGH */
case EXLEN:
if (state->flags & 0x0400) {
NEEDBITS(16);
case EXLEN:
if (state->flags & 0x0400) {
NEEDBITS(16);
@@
-677,6
+680,7
@@
int flush;
else if (state->head != Z_NULL)
state->head->extra = Z_NULL;
state->mode = EXTRA;
else if (state->head != Z_NULL)
state->head->extra = Z_NULL;
state->mode = EXTRA;
+ /* FALL THROUGH */
case EXTRA:
if (state->flags & 0x0400) {
copy = state->length;
case EXTRA:
if (state->flags & 0x0400) {
copy = state->length;
@@
-699,6
+703,7
@@
int flush;
}
state->length = 0;
state->mode = NAME;
}
state->length = 0;
state->mode = NAME;
+ /* FALL THROUGH */
case NAME:
if (state->flags & 0x0800) {
if (have == 0) goto inf_leave;
case NAME:
if (state->flags & 0x0800) {
if (have == 0) goto inf_leave;
@@
-720,6
+725,7
@@
int flush;
state->head->name = Z_NULL;
state->length = 0;
state->mode = COMMENT;
state->head->name = Z_NULL;
state->length = 0;
state->mode = COMMENT;
+ /* FALL THROUGH */
case COMMENT:
if (state->flags & 0x1000) {
if (have == 0) goto inf_leave;
case COMMENT:
if (state->flags & 0x1000) {
if (have == 0) goto inf_leave;
@@
-740,6
+746,7
@@
int flush;
else if (state->head != Z_NULL)
state->head->comment = Z_NULL;
state->mode = HCRC;
else if (state->head != Z_NULL)
state->head->comment = Z_NULL;
state->mode = HCRC;
+ /* FALL THROUGH */
case HCRC:
if (state->flags & 0x0200) {
NEEDBITS(16);
case HCRC:
if (state->flags & 0x0200) {
NEEDBITS(16);
@@
-763,6
+770,7
@@
int flush;
strm->adler = state->check = REVERSE(hold);
INITBITS();
state->mode = DICT;
strm->adler = state->check = REVERSE(hold);
INITBITS();
state->mode = DICT;
+ /* FALL THROUGH */
case DICT:
if (state->havedict == 0) {
RESTORE();
case DICT:
if (state->havedict == 0) {
RESTORE();
@@
-770,8
+778,10
@@
int flush;
}
strm->adler = state->check = adler32(0L, Z_NULL, 0);
state->mode = TYPE;
}
strm->adler = state->check = adler32(0L, Z_NULL, 0);
state->mode = TYPE;
+ /* FALL THROUGH */
case TYPE:
if (flush == Z_BLOCK) goto inf_leave;
case TYPE:
if (flush == Z_BLOCK) goto inf_leave;
+ /* FALL THROUGH */
case TYPEDO:
if (state->last) {
BYTEBITS();
case TYPEDO:
if (state->last) {
BYTEBITS();
@@
-817,6
+827,7
@@
int flush;
state->length));
INITBITS();
state->mode = COPY;
state->length));
INITBITS();
state->mode = COPY;
+ /* FALL THROUGH */
case COPY:
copy = state->length;
if (copy) {
case COPY:
copy = state->length;
if (copy) {
@@
-852,6
+863,7
@@
int flush;
Tracev((stderr, "inflate: table sizes ok\n"));
state->have = 0;
state->mode = LENLENS;
Tracev((stderr, "inflate: table sizes ok\n"));
state->have = 0;
state->mode = LENLENS;
+ /* FALL THROUGH */
case LENLENS:
while (state->have < state->ncode) {
NEEDBITS(3);
case LENLENS:
while (state->have < state->ncode) {
NEEDBITS(3);
@@
-873,6
+885,7
@@
int flush;
Tracev((stderr, "inflate: code lengths ok\n"));
state->have = 0;
state->mode = CODELENS;
Tracev((stderr, "inflate: code lengths ok\n"));
state->have = 0;
state->mode = CODELENS;
+ /* FALL THROUGH */
case CODELENS:
while (state->have < state->nlen + state->ndist) {
for (;;) {
case CODELENS:
while (state->have < state->nlen + state->ndist) {
for (;;) {
@@
-947,6
+960,7
@@
int flush;
}
Tracev((stderr, "inflate: codes ok\n"));
state->mode = LEN;
}
Tracev((stderr, "inflate: codes ok\n"));
state->mode = LEN;
+ /* FALL THROUGH */
case LEN:
if (have >= 6 && left >= 258) {
RESTORE();
case LEN:
if (have >= 6 && left >= 258) {
RESTORE();
@@
-990,6
+1004,7
@@
int flush;
}
state->extra = (unsigned)(this.op) & 15;
state->mode = LENEXT;
}
state->extra = (unsigned)(this.op) & 15;
state->mode = LENEXT;
+ /* FALL THROUGH */
case LENEXT:
if (state->extra) {
NEEDBITS(state->extra);
case LENEXT:
if (state->extra) {
NEEDBITS(state->extra);
@@
-998,6
+1013,7
@@
int flush;
}
Tracevv((stderr, "inflate: length %u\n", state->length));
state->mode = DIST;
}
Tracevv((stderr, "inflate: length %u\n", state->length));
state->mode = DIST;
+ /* FALL THROUGH */
case DIST:
for (;;) {
this = state->distcode[BITS(state->distbits)];
case DIST:
for (;;) {
this = state->distcode[BITS(state->distbits)];
@@
-1023,6
+1039,7
@@
int flush;
state->offset = (unsigned)this.val;
state->extra = (unsigned)(this.op) & 15;
state->mode = DISTEXT;
state->offset = (unsigned)this.val;
state->extra = (unsigned)(this.op) & 15;
state->mode = DISTEXT;
+ /* FALL THROUGH */
case DISTEXT:
if (state->extra) {
NEEDBITS(state->extra);
case DISTEXT:
if (state->extra) {
NEEDBITS(state->extra);
@@
-1043,6
+1060,7
@@
int flush;
}
Tracevv((stderr, "inflate: distance %u\n", state->offset));
state->mode = MATCH;
}
Tracevv((stderr, "inflate: distance %u\n", state->offset));
state->mode = MATCH;
+ /* FALL THROUGH */
case MATCH:
if (left == 0) goto inf_leave;
copy = out - left;
case MATCH:
if (left == 0) goto inf_leave;
copy = out - left;
@@
-1098,6
+1116,7
@@
int flush;
}
#ifdef GUNZIP
state->mode = LENGTH;
}
#ifdef GUNZIP
state->mode = LENGTH;
+ /* FALL THROUGH */
case LENGTH:
if (state->wrap && state->flags) {
NEEDBITS(32);
case LENGTH:
if (state->wrap && state->flags) {
NEEDBITS(32);
@@
-1111,6
+1130,7
@@
int flush;
}
#endif
state->mode = DONE;
}
#endif
state->mode = DONE;
+ /* FALL THROUGH */
case DONE:
ret = Z_STREAM_END;
goto inf_leave;
case DONE:
ret = Z_STREAM_END;
goto inf_leave;