r5663 - trunk/varnish-cache/lib/libvgz
phk at varnish-cache.org
phk at varnish-cache.org
Tue Dec 28 15:31:39 CET 2010
Author: phk
Date: 2010-12-28 15:31:38 +0100 (Tue, 28 Dec 2010)
New Revision: 5663
Modified:
trunk/varnish-cache/lib/libvgz/compress.c
trunk/varnish-cache/lib/libvgz/deflate.c
trunk/varnish-cache/lib/libvgz/gzlib.c
trunk/varnish-cache/lib/libvgz/gzwrite.c
trunk/varnish-cache/lib/libvgz/infback.c
trunk/varnish-cache/lib/libvgz/inffast.c
trunk/varnish-cache/lib/libvgz/inflate.c
trunk/varnish-cache/lib/libvgz/trees.c
trunk/varnish-cache/lib/libvgz/uncompr.c
trunk/varnish-cache/lib/libvgz/zlib.h
trunk/varnish-cache/lib/libvgz/zutil.h
Log:
Fix the cast-qualifier assignment issues.
Modified: trunk/varnish-cache/lib/libvgz/compress.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/compress.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/compress.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -29,7 +29,7 @@
z_stream stream;
int err;
- stream.next_in = (Bytef*)source;
+ stream.next_in = (Bytef*)(uintptr_t)source;
stream.avail_in = (uInt)sourceLen;
#ifdef MAXSEG_64K
/* Check for source > 64K on 16-bit machine: */
Modified: trunk/varnish-cache/lib/libvgz/deflate.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/deflate.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/deflate.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -293,7 +293,7 @@
if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
s->pending_buf == Z_NULL) {
s->status = FINISH_STATE;
- strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+ strm->msg = ERR_MSG(Z_MEM_ERROR);
deflateEnd (strm);
return Z_MEM_ERROR;
}
Modified: trunk/varnish-cache/lib/libvgz/gzlib.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/gzlib.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/gzlib.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -501,14 +501,14 @@
/* for an out of memory error, save as static string */
if (err == Z_MEM_ERROR) {
- state->msg = (char *)msg;
+ state->msg = (char *)(uintptr_t)msg;
return;
}
/* construct error message with path */
if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
state->err = Z_MEM_ERROR;
- state->msg = (char *)"out of memory";
+ state->msg = (char *)(uintptr_t)"out of memory";
return;
}
strcpy(state->msg, state->path);
Modified: trunk/varnish-cache/lib/libvgz/gzwrite.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/gzwrite.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/gzwrite.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -194,7 +194,7 @@
memcpy(strm->next_in + strm->avail_in, buf, n);
strm->avail_in += n;
state->pos += n;
- buf = (char *)buf + n;
+ buf = (char *)((uintptr_t)buf + n);
len -= n;
if (len && gz_comp(state, Z_NO_FLUSH) == -1)
return 0;
@@ -207,7 +207,7 @@
/* directly compress user buffer to file */
strm->avail_in = len;
- strm->next_in = (voidp)buf;
+ strm->next_in = (voidp)(uintptr_t)buf;
state->pos += len;
if (gz_comp(state, Z_NO_FLUSH) == -1)
return 0;
Modified: trunk/varnish-cache/lib/libvgz/infback.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/infback.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/infback.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -308,7 +308,7 @@
state->mode = TABLE;
break;
case 3:
- strm->msg = (char *)"invalid block type";
+ strm->msg = "invalid block type";
state->mode = BAD;
}
DROPBITS(2);
@@ -319,7 +319,7 @@
BYTEBITS(); /* go to byte boundary */
NEEDBITS(32);
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
- strm->msg = (char *)"invalid stored block lengths";
+ strm->msg = "invalid stored block lengths";
state->mode = BAD;
break;
}
@@ -357,7 +357,7 @@
DROPBITS(4);
#ifndef PKZIP_BUG_WORKAROUND
if (state->nlen > 286 || state->ndist > 30) {
- strm->msg = (char *)"too many length or distance symbols";
+ strm->msg = "too many length or distance symbols";
state->mode = BAD;
break;
}
@@ -379,7 +379,7 @@
ret = inflate_table(CODES, state->lens, 19, &(state->next),
&(state->lenbits), state->work);
if (ret) {
- strm->msg = (char *)"invalid code lengths set";
+ strm->msg = "invalid code lengths set";
state->mode = BAD;
break;
}
@@ -403,7 +403,7 @@
NEEDBITS(here.bits + 2);
DROPBITS(here.bits);
if (state->have == 0) {
- strm->msg = (char *)"invalid bit length repeat";
+ strm->msg = "invalid bit length repeat";
state->mode = BAD;
break;
}
@@ -426,7 +426,7 @@
DROPBITS(7);
}
if (state->have + copy > state->nlen + state->ndist) {
- strm->msg = (char *)"invalid bit length repeat";
+ strm->msg = "invalid bit length repeat";
state->mode = BAD;
break;
}
@@ -440,7 +440,7 @@
/* check for end-of-block code (better have one) */
if (state->lens[256] == 0) {
- strm->msg = (char *)"invalid code -- missing end-of-block";
+ strm->msg = "invalid code -- missing end-of-block";
state->mode = BAD;
break;
}
@@ -454,7 +454,7 @@
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
&(state->lenbits), state->work);
if (ret) {
- strm->msg = (char *)"invalid literal/lengths set";
+ strm->msg = "invalid literal/lengths set";
state->mode = BAD;
break;
}
@@ -463,7 +463,7 @@
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
&(state->next), &(state->distbits), state->work);
if (ret) {
- strm->msg = (char *)"invalid distances set";
+ strm->msg = "invalid distances set";
state->mode = BAD;
break;
}
@@ -521,7 +521,7 @@
/* invalid code */
if (here.op & 64) {
- strm->msg = (char *)"invalid literal/length code";
+ strm->msg = "invalid literal/length code";
state->mode = BAD;
break;
}
@@ -553,7 +553,7 @@
}
DROPBITS(here.bits);
if (here.op & 64) {
- strm->msg = (char *)"invalid distance code";
+ strm->msg = "invalid distance code";
state->mode = BAD;
break;
}
@@ -568,7 +568,7 @@
}
if (state->offset > state->wsize - (state->whave < state->wsize ?
left : 0)) {
- strm->msg = (char *)"invalid distance too far back";
+ strm->msg = "invalid distance too far back";
state->mode = BAD;
break;
}
Modified: trunk/varnish-cache/lib/libvgz/inffast.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/inffast.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/inffast.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -175,7 +175,7 @@
dist += (unsigned)hold & ((1U << op) - 1);
#ifdef INFLATE_STRICT
if (dist > dmax) {
- strm->msg = (char *)"invalid distance too far back";
+ strm->msg = "invalid distance too far back";
state->mode = BAD;
break;
}
@@ -188,8 +188,7 @@
op = dist - op; /* distance back in window */
if (op > whave) {
if (state->sane) {
- strm->msg =
- (char *)"invalid distance too far back";
+ strm->msg = "invalid distance too far back";
state->mode = BAD;
break;
}
@@ -285,7 +284,7 @@
goto dodist;
}
else {
- strm->msg = (char *)"invalid distance code";
+ strm->msg = "invalid distance code";
state->mode = BAD;
break;
}
@@ -300,7 +299,7 @@
break;
}
else {
- strm->msg = (char *)"invalid literal/length code";
+ strm->msg = "invalid literal/length code";
state->mode = BAD;
break;
}
Modified: trunk/varnish-cache/lib/libvgz/inflate.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/inflate.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/inflate.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -643,12 +643,12 @@
if (
#endif
((BITS(8) << 8) + (hold >> 8)) % 31) {
- strm->msg = (char *)"incorrect header check";
+ strm->msg = "incorrect header check";
state->mode = BAD;
break;
}
if (BITS(4) != Z_DEFLATED) {
- strm->msg = (char *)"unknown compression method";
+ strm->msg = "unknown compression method";
state->mode = BAD;
break;
}
@@ -657,7 +657,7 @@
if (state->wbits == 0)
state->wbits = len;
else if (len > state->wbits) {
- strm->msg = (char *)"invalid window size";
+ strm->msg = "invalid window size";
state->mode = BAD;
break;
}
@@ -672,12 +672,12 @@
NEEDBITS(16);
state->flags = (int)(hold);
if ((state->flags & 0xff) != Z_DEFLATED) {
- strm->msg = (char *)"unknown compression method";
+ strm->msg = "unknown compression method";
state->mode = BAD;
break;
}
if (state->flags & 0xe000) {
- strm->msg = (char *)"unknown header flags set";
+ strm->msg = "unknown header flags set";
state->mode = BAD;
break;
}
@@ -781,7 +781,7 @@
if (state->flags & 0x0200) {
NEEDBITS(16);
if (hold != (state->check & 0xffff)) {
- strm->msg = (char *)"header crc mismatch";
+ strm->msg = "header crc mismatch";
state->mode = BAD;
break;
}
@@ -840,7 +840,7 @@
state->mode = TABLE;
break;
case 3:
- strm->msg = (char *)"invalid block type";
+ strm->msg = "invalid block type";
state->mode = BAD;
}
DROPBITS(2);
@@ -849,7 +849,7 @@
BYTEBITS(); /* go to byte boundary */
NEEDBITS(32);
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
- strm->msg = (char *)"invalid stored block lengths";
+ strm->msg = "invalid stored block lengths";
state->mode = BAD;
break;
}
@@ -888,7 +888,7 @@
DROPBITS(4);
#ifndef PKZIP_BUG_WORKAROUND
if (state->nlen > 286 || state->ndist > 30) {
- strm->msg = (char *)"too many length or distance symbols";
+ strm->msg = "too many length or distance symbols";
state->mode = BAD;
break;
}
@@ -910,7 +910,7 @@
ret = inflate_table(CODES, state->lens, 19, &(state->next),
&(state->lenbits), state->work);
if (ret) {
- strm->msg = (char *)"invalid code lengths set";
+ strm->msg = "invalid code lengths set";
state->mode = BAD;
break;
}
@@ -934,7 +934,7 @@
NEEDBITS(here.bits + 2);
DROPBITS(here.bits);
if (state->have == 0) {
- strm->msg = (char *)"invalid bit length repeat";
+ strm->msg = "invalid bit length repeat";
state->mode = BAD;
break;
}
@@ -957,7 +957,7 @@
DROPBITS(7);
}
if (state->have + copy > state->nlen + state->ndist) {
- strm->msg = (char *)"invalid bit length repeat";
+ strm->msg = "invalid bit length repeat";
state->mode = BAD;
break;
}
@@ -971,7 +971,7 @@
/* check for end-of-block code (better have one) */
if (state->lens[256] == 0) {
- strm->msg = (char *)"invalid code -- missing end-of-block";
+ strm->msg = "invalid code -- missing end-of-block";
state->mode = BAD;
break;
}
@@ -985,7 +985,7 @@
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
&(state->lenbits), state->work);
if (ret) {
- strm->msg = (char *)"invalid literal/lengths set";
+ strm->msg = "invalid literal/lengths set";
state->mode = BAD;
break;
}
@@ -994,7 +994,7 @@
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
&(state->next), &(state->distbits), state->work);
if (ret) {
- strm->msg = (char *)"invalid distances set";
+ strm->msg = "invalid distances set";
state->mode = BAD;
break;
}
@@ -1046,7 +1046,7 @@
break;
}
if (here.op & 64) {
- strm->msg = (char *)"invalid literal/length code";
+ strm->msg = "invalid literal/length code";
state->mode = BAD;
break;
}
@@ -1082,7 +1082,7 @@
DROPBITS(here.bits);
state->back += here.bits;
if (here.op & 64) {
- strm->msg = (char *)"invalid distance code";
+ strm->msg = "invalid distance code";
state->mode = BAD;
break;
}
@@ -1098,7 +1098,7 @@
}
#ifdef INFLATE_STRICT
if (state->offset > state->dmax) {
- strm->msg = (char *)"invalid distance too far back";
+ strm->msg = "invalid distance too far back";
state->mode = BAD;
break;
}
@@ -1112,7 +1112,7 @@
copy = state->offset - copy;
if (copy > state->whave) {
if (state->sane) {
- strm->msg = (char *)"invalid distance too far back";
+ strm->msg = "invalid distance too far back";
state->mode = BAD;
break;
}
@@ -1171,7 +1171,7 @@
state->flags ? hold :
#endif
REVERSE(hold)) != state->check) {
- strm->msg = (char *)"incorrect data check";
+ strm->msg = "incorrect data check";
state->mode = BAD;
break;
}
@@ -1184,7 +1184,7 @@
if (state->wrap && state->flags) {
NEEDBITS(32);
if (hold != (state->total & 0xffffffffUL)) {
- strm->msg = (char *)"incorrect length check";
+ strm->msg = "incorrect length check";
state->mode = BAD;
break;
}
Modified: trunk/varnish-cache/lib/libvgz/trees.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/trees.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/trees.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -990,7 +990,8 @@
} else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
#endif
send_bits(s, (STATIC_TREES<<1)+last, 3);
- compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+ compress_block(s, (ct_data *)(uintptr_t)static_ltree,
+ (ct_data *)(uintptr_t)static_dtree);
#ifdef DEBUG
s->compressed_len += 3 + s->static_len;
#endif
Modified: trunk/varnish-cache/lib/libvgz/uncompr.c
===================================================================
--- trunk/varnish-cache/lib/libvgz/uncompr.c 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/uncompr.c 2010-12-28 14:31:38 UTC (rev 5663)
@@ -30,7 +30,7 @@
z_stream stream;
int err;
- stream.next_in = (Bytef*)source;
+ stream.next_in = (Bytef*)(uintptr_t)source;
stream.avail_in = (uInt)sourceLen;
/* Check for source > 64K on 16-bit machine: */
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
Modified: trunk/varnish-cache/lib/libvgz/zlib.h
===================================================================
--- trunk/varnish-cache/lib/libvgz/zlib.h 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/zlib.h 2010-12-28 14:31:38 UTC (rev 5663)
@@ -91,7 +91,7 @@
uInt avail_out; /* remaining free space at next_out */
uLong total_out; /* total nb of bytes output so far */
- char *msg; /* last error message, NULL if no error */
+ const char *msg; /* last error message, NULL if no error */
struct internal_state FAR *state; /* not visible by applications */
alloc_func zalloc; /* used to allocate the internal state */
Modified: trunk/varnish-cache/lib/libvgz/zutil.h
===================================================================
--- trunk/varnish-cache/lib/libvgz/zutil.h 2010-12-28 14:09:23 UTC (rev 5662)
+++ trunk/varnish-cache/lib/libvgz/zutil.h 2010-12-28 14:31:38 UTC (rev 5663)
@@ -46,7 +46,7 @@
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
#define ERR_RETURN(strm,err) \
- return (strm->msg = (char*)ERR_MSG(err), (err))
+ return (strm->msg = ERR_MSG(err), (err))
/* To be used only when the state is known to be valid */
/* common constants */
More information about the varnish-commit
mailing list