From: rousskov <> Date: Fri, 10 Apr 1998 05:51:40 +0000 (+0000) Subject: - HttpBody.c: an ugly tmp cast to remove warning in httpBodySet X-Git-Tag: SQUID_3_0_PRE1~3519 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f6eb0fe387ef50537d39e8d34acca0883eeaa21;p=thirdparty%2Fsquid.git - HttpBody.c: an ugly tmp cast to remove warning in httpBodySet - peer_digest.c: OLD_CODE around unused function --- diff --git a/src/HttpBody.cc b/src/HttpBody.cc index 099cf5b2d0..bce6464686 100644 --- a/src/HttpBody.cc +++ b/src/HttpBody.cc @@ -1,7 +1,7 @@ /* - * $Id: HttpBody.cc,v 1.7 1998/04/09 23:40:39 rousskov Exp $ + * $Id: HttpBody.cc,v 1.8 1998/04/09 23:51:40 rousskov Exp $ * * DEBUG: section 56 HTTP Message Body * AUTHOR: Alex Rousskov @@ -72,7 +72,8 @@ httpBodySet(HttpBody * body, const char *buf, int size, FREE * freefunc) xmemcpy(body->buf, buf, size); freefunc = &xfree; } else { - body->buf = buf; + /* @?@ @?@ Fix this cast: we should probably have two httpBodySet()s */ + body->buf = (char*)buf; } body->freefunc = freefunc; body->size = size; diff --git a/src/peer_digest.cc b/src/peer_digest.cc index 3419cfc6ea..0a7b202f6d 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -1,6 +1,6 @@ /* - * $Id: peer_digest.cc,v 1.10 1998/04/09 23:43:27 rousskov Exp $ + * $Id: peer_digest.cc,v 1.11 1998/04/09 23:51:41 rousskov Exp $ * * DEBUG: section 72 Peer Digest Routines * AUTHOR: Alex Rousskov @@ -51,7 +51,6 @@ static STCB peerDigestSwapInMask; static int peerDigestFetchedEnough(DigestFetchState *fetch, char *buf, ssize_t size, const char *step_name); static void peerDigestFetchFinish(DigestFetchState *fetch, char *buf, const char *err_msg); static int peerDigestSetCBlock(peer *p, const char *buf); -static int peerDigestUpdateMask(peer *peer, int offset, const char *buf, int size); #define max_delay(t1,t2) ((t1) >= (t2) ? (t1) : (t2)) @@ -601,6 +600,8 @@ peerDigestSetCBlock(peer *peer, const char *buf) return 1; } +#if OLD_CODE + /* updates current mask. checks for overflows */ static int peerDigestUpdateMask(peer *peer, int offset, const char *buf, int size) @@ -617,5 +618,7 @@ peerDigestUpdateMask(peer *peer, int offset, const char *buf, int size) } return 1; } + +#endif #endif