Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8bf7374
)
change BAD to ZBAD to avoid conflict with some systems
author
Andrew Tridgell
<tridge@samba.org>
Tue, 1 Oct 1996 06:44:00 +0000
(06:44 +0000)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 1 Oct 1996 06:44:00 +0000
(06:44 +0000)
lib/zlib.c
patch
|
blob
|
blame
|
history
diff --git
a/lib/zlib.c
b/lib/zlib.c
index
ff689b1
..
f26071e
100644
(file)
--- a/
lib/zlib.c
+++ b/
lib/zlib.c
@@
-2742,7
+2742,7
@@
struct internal_state {
CHECK2, /* two check bytes to go */
CHECK1, /* one check byte to go */
DONE, /* finished check, done */
CHECK2, /* two check bytes to go */
CHECK1, /* one check byte to go */
DONE, /* finished check, done */
- BAD} /* got an error--stay here */
+
Z
BAD} /* got an error--stay here */
mode; /* current inflate mode */
/* mode dependent information */
mode; /* current inflate mode */
/* mode dependent information */
@@
-2752,7
+2752,7
@@
struct internal_state {
uLong was; /* computed check value */
uLong need; /* stream check value */
} check; /* if CHECK, check values to compare */
uLong was; /* computed check value */
uLong need; /* stream check value */
} check; /* if CHECK, check values to compare */
- uInt marker; /* if BAD, inflateSync's marker bytes count */
+ uInt marker; /* if
Z
BAD, inflateSync's marker bytes count */
} sub; /* submode */
/* mode independent information */
} sub; /* submode */
/* mode independent information */
@@
-2868,14
+2868,14
@@
int f;
NEEDBYTE
if (((z->state->sub.method = NEXTBYTE) & 0xf) != DEFLATED)
{
NEEDBYTE
if (((z->state->sub.method = NEXTBYTE) & 0xf) != DEFLATED)
{
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->msg = "unknown compression method";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
}
if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
{
z->msg = "unknown compression method";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
}
if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
{
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->msg = "invalid window size";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
z->msg = "invalid window size";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
@@
-2885,14
+2885,14
@@
int f;
NEEDBYTE
if ((b = NEXTBYTE) & 0x20)
{
NEEDBYTE
if ((b = NEXTBYTE) & 0x20)
{
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->msg = "invalid reserved bit";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
}
if (((z->state->sub.method << 8) + b) % 31)
{
z->msg = "invalid reserved bit";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
}
if (((z->state->sub.method << 8) + b) % 31)
{
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->msg = "incorrect header check";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
z->msg = "incorrect header check";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
@@
-2905,7
+2905,7
@@
int f;
r = inflate_packet_flush(z->state->blocks);
if (r == Z_DATA_ERROR)
{
r = inflate_packet_flush(z->state->blocks);
if (r == Z_DATA_ERROR)
{
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->state->sub.marker = 0; /* can try inflateSync */
break;
}
z->state->sub.marker = 0; /* can try inflateSync */
break;
}
@@
-2937,7
+2937,7
@@
int f;
if (z->state->sub.check.was != z->state->sub.check.need)
{
if (z->state->sub.check.was != z->state->sub.check.need)
{
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->msg = "incorrect data check";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
z->msg = "incorrect data check";
z->state->sub.marker = 5; /* can't try inflateSync */
break;
@@
-2946,7
+2946,7
@@
int f;
z->state->mode = DONE;
case DONE:
return Z_STREAM_END;
z->state->mode = DONE;
case DONE:
return Z_STREAM_END;
- case BAD:
+ case
Z
BAD:
return Z_DATA_ERROR;
default:
return Z_STREAM_ERROR;
return Z_DATA_ERROR;
default:
return Z_STREAM_ERROR;
@@
-2955,7
+2955,7
@@
int f;
empty:
if (f != Z_PACKET_FLUSH)
return r;
empty:
if (f != Z_PACKET_FLUSH)
return r;
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->state->sub.marker = 0; /* can try inflateSync */
return Z_DATA_ERROR;
}
z->state->sub.marker = 0; /* can try inflateSync */
return Z_DATA_ERROR;
}
@@
-2989,9
+2989,9
@@
z_stream *z;
/* set up */
if (z == Z_NULL || z->state == Z_NULL)
return Z_STREAM_ERROR;
/* set up */
if (z == Z_NULL || z->state == Z_NULL)
return Z_STREAM_ERROR;
- if (z->state->mode != BAD)
+ if (z->state->mode !=
Z
BAD)
{
{
- z->state->mode = BAD;
+ z->state->mode =
Z
BAD;
z->state->sub.marker = 0;
}
if ((n = z->avail_in) == 0)
z->state->sub.marker = 0;
}
if ((n = z->avail_in) == 0)