projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Placate gcc's `-Wall' warnings.
[u/mdw/putty]
/
sshzlib.c
diff --git
a/sshzlib.c
b/sshzlib.c
index
0124953
..
cf471db
100644
(file)
--- a/
sshzlib.c
+++ b/
sshzlib.c
@@
-207,6
+207,7
@@
static void lz77_compress(struct LZ77Context *ctx,
st->npending -= i;
defermatch.len = 0;
st->npending -= i;
defermatch.len = 0;
+ deferchr = '\0';
while (len > 0) {
/* Don't even look for a match, if we're not compressing. */
while (len > 0) {
/* Don't even look for a match, if we're not compressing. */
@@
-519,7
+520,8
@@
static void zlib_match(struct LZ77Context *ectx, int distance, int len)
*/
i = -1;
j = sizeof(lencodes) / sizeof(*lencodes);
*/
i = -1;
j = sizeof(lencodes) / sizeof(*lencodes);
- while (j - i >= 2) {
+ while (1) {
+ assert(j - i >= 2);
k = (j + i) / 2;
if (thislen < lencodes[k].min)
j = k;
k = (j + i) / 2;
if (thislen < lencodes[k].min)
j = k;
@@
-554,7
+556,8
@@
static void zlib_match(struct LZ77Context *ectx, int distance, int len)
*/
i = -1;
j = sizeof(distcodes) / sizeof(*distcodes);
*/
i = -1;
j = sizeof(distcodes) / sizeof(*distcodes);
- while (j - i >= 2) {
+ while (1) {
+ assert(j - i >= 2);
k = (j + i) / 2;
if (distance < distcodes[k].min)
j = k;
k = (j + i) / 2;
if (distance < distcodes[k].min)
j = k;
@@
-656,7
+659,8
@@
int zlib_compress_block(unsigned char *block, int len,
out->firstblock = 0;
in_block = FALSE;
out->firstblock = 0;
in_block = FALSE;
- }
+ } else
+ in_block = TRUE;
if (out->comp_disabled) {
if (in_block)
if (out->comp_disabled) {
if (in_block)