--------------------- PatchSet 6475 Date: 2005/03/05 20:58:56 Author: hno Branch: lfs-2_5 Tag: lfs-2_5-20050309 Log: Various site_t typecasts to int in debug output Members: helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.11->1.2.2.11.16.1 src/client_side.c:1.47.2.56.2.4->1.47.2.56.2.5 src/disk.c:1.8.14.2.8.2->1.8.14.2.8.3 src/htcp.c:1.9.2.5.2.4->1.9.2.5.2.5 src/peer_digest.c:1.10.6.1.16.2->1.10.6.1.16.3 src/stat.c:1.13.6.11.2.2->1.13.6.11.2.3 src/fs/coss/store_io_coss.c:1.9.6.6.16.1->1.9.6.6.16.2 Index: squid/helpers/external_acl/winbind_group/wb_check_group.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/winbind_group/Attic/wb_check_group.c,v retrieving revision 1.2.2.11 retrieving revision 1.2.2.11.16.1 diff -u -r1.2.2.11 -r1.2.2.11.16.1 --- squid/helpers/external_acl/winbind_group/wb_check_group.c 13 Sep 2003 02:14:23 -0000 1.2.2.11 +++ squid/helpers/external_acl/winbind_group/wb_check_group.c 5 Mar 2005 20:58:56 -0000 1.2.2.11.16.1 @@ -364,7 +364,7 @@ if ((p = strchr(buf, '\r')) != NULL) *p = '\0'; /* strip \r */ - debug("Got '%s' from Squid (length: %d).\n",buf,strlen(buf)); + debug("Got '%s' from Squid (length: %d).\n",buf,(int)strlen(buf)); if (buf[0] == '\0') { warn("Invalid Request\n"); Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.47.2.56.2.4 retrieving revision 1.47.2.56.2.5 diff -u -r1.47.2.56.2.4 -r1.47.2.56.2.5 --- squid/src/client_side.c 3 Mar 2005 04:43:42 -0000 1.47.2.56.2.4 +++ squid/src/client_side.c 5 Mar 2005 20:58:57 -0000 1.47.2.56.2.5 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.47.2.56.2.4 2005/03/03 04:43:42 hno Exp $ + * $Id: client_side.c,v 1.47.2.56.2.5 2005/03/05 20:58:57 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -2185,7 +2185,7 @@ int done; http->out.size += size; debug(33, 5) ("clientWriteComplete: FD %d, sz %d, err %d, off %"PRINTF_OFF_T", len %"PRINTF_OFF_T"\n", - fd, size, errflag, http->out.offset, entry ? objectLen(entry) : (squid_off_t)0); + fd, (int)size, errflag, http->out.offset, entry ? objectLen(entry) : (squid_off_t)0); if (size > 0) { kb_incr(&statCounter.client_http.kbytes_out, size); if (isTcpHit(http->log_type)) @@ -2589,7 +2589,7 @@ static int pffd = -1; #endif #if LINUX_NETFILTER - size_t sock_sz = sizeof(conn->me); + socklen_t sock_sz = sizeof(conn->me); #endif /* pre-set these values to make aborting simpler */ Index: squid/src/disk.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/disk.c,v retrieving revision 1.8.14.2.8.2 retrieving revision 1.8.14.2.8.3 diff -u -r1.8.14.2.8.2 -r1.8.14.2.8.3 --- squid/src/disk.c 3 Mar 2005 04:43:42 -0000 1.8.14.2.8.2 +++ squid/src/disk.c 5 Mar 2005 20:58:58 -0000 1.8.14.2.8.3 @@ -1,6 +1,6 @@ /* - * $Id: disk.c,v 1.8.14.2.8.2 2005/03/03 04:43:42 hno Exp $ + * $Id: disk.c,v 1.8.14.2.8.3 2005/03/05 20:58:58 hno Exp $ * * DEBUG: section 6 Disk I/O Routines * AUTHOR: Harvest Derived @@ -239,7 +239,7 @@ q->buf_offset += len; if (q->buf_offset > q->len) debug(50, 1) ("diskHandleWriteComplete: q->buf_offset > q->len (%p,%d, %d, %d FD %d)\n", - q, (int) q->buf_offset, q->len, len, fd); + q, (int) q->buf_offset, (int)q->len, len, fd); assert(q->buf_offset <= q->len); if (q->buf_offset == q->len) { /* complete write */ Index: squid/src/htcp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/htcp.c,v retrieving revision 1.9.2.5.2.4 retrieving revision 1.9.2.5.2.5 diff -u -r1.9.2.5.2.4 -r1.9.2.5.2.5 --- squid/src/htcp.c 3 Mar 2005 04:43:43 -0000 1.9.2.5.2.4 +++ squid/src/htcp.c 5 Mar 2005 20:58:58 -0000 1.9.2.5.2.5 @@ -1,6 +1,6 @@ /* - * $Id: htcp.c,v 1.9.2.5.2.4 2005/03/03 04:43:43 hno Exp $ + * $Id: htcp.c,v 1.9.2.5.2.5 2005/03/05 20:58:58 hno Exp $ * * DEBUG: section 31 Hypertext Caching Protocol * AUTHOR: Duane Wesssels @@ -234,7 +234,7 @@ len = strlen(s); else len = 0; - debug(31, 3) ("htcpBuildCountstr: LENGTH = %d\n", len); + debug(31, 3) ("htcpBuildCountstr: LENGTH = %d\n", (int)len); debug(31, 3) ("htcpBuildCountstr: TEXT = {%s}\n", s ? s : ""); length = htons((u_short) len); xmemcpy(buf + off, &length, 2); Index: squid/src/peer_digest.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/peer_digest.c,v retrieving revision 1.10.6.1.16.2 retrieving revision 1.10.6.1.16.3 diff -u -r1.10.6.1.16.2 -r1.10.6.1.16.3 --- squid/src/peer_digest.c 3 Mar 2005 03:44:05 -0000 1.10.6.1.16.2 +++ squid/src/peer_digest.c 5 Mar 2005 20:58:58 -0000 1.10.6.1.16.3 @@ -1,6 +1,6 @@ /* - * $Id: peer_digest.c,v 1.10.6.1.16.2 2005/03/03 03:44:05 hno Exp $ + * $Id: peer_digest.c,v 1.10.6.1.16.3 2005/03/05 20:58:58 hno Exp $ * * DEBUG: section 72 Peer Digest Routines * AUTHOR: Alex Rousskov @@ -541,7 +541,7 @@ host = strBuf(pd->host); } debug(72, 6) ("%s: peer %s, offset: %"PRINTF_OFF_T" size: %d.\n", - step_name, host, fcb_valid ? fetch->offset : (squid_off_t)-1, size); + step_name, host, fcb_valid ? fetch->offset : (squid_off_t)-1, (int)size); /* continue checking (with pd and host known and valid) */ if (!reason) { @@ -778,7 +778,7 @@ /* check consistency further */ if (cblock.mask_size != cacheDigestCalcMaskSize(cblock.capacity, cblock.bits_per_entry)) { debug(72, 0) ("%s digest cblock is corrupted (mask size mismatch: %d ? %d).\n", - host, cblock.mask_size, cacheDigestCalcMaskSize(cblock.capacity, cblock.bits_per_entry)); + host, cblock.mask_size, (int)cacheDigestCalcMaskSize(cblock.capacity, cblock.bits_per_entry)); return 0; } /* there are some things we cannot do yet */ Index: squid/src/stat.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/stat.c,v retrieving revision 1.13.6.11.2.2 retrieving revision 1.13.6.11.2.3 diff -u -r1.13.6.11.2.2 -r1.13.6.11.2.3 --- squid/src/stat.c 3 Mar 2005 01:31:16 -0000 1.13.6.11.2.2 +++ squid/src/stat.c 5 Mar 2005 20:58:58 -0000 1.13.6.11.2.3 @@ -1,6 +1,6 @@ /* - * $Id: stat.c,v 1.13.6.11.2.2 2005/03/03 01:31:16 hno Exp $ + * $Id: stat.c,v 1.13.6.11.2.3 2005/03/05 20:58:58 hno Exp $ * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived @@ -1397,7 +1397,7 @@ */ cd = CountHist[0].cd.kbytes_recv.kb - CountHist[minutes].cd.kbytes_recv.kb; if (s < cd) - debug(18, 1) ("STRANGE: srv_kbytes=%d, cd_kbytes=%d\n", s, cd); + debug(18, 1) ("STRANGE: srv_kbytes=%d, cd_kbytes=%d\n", (int)s, (int)cd); s -= cd; #endif if (c > s) Index: squid/src/fs/coss/store_io_coss.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/coss/store_io_coss.c,v retrieving revision 1.9.6.6.16.1 retrieving revision 1.9.6.6.16.2 diff -u -r1.9.6.6.16.1 -r1.9.6.6.16.2 --- squid/src/fs/coss/store_io_coss.c 3 Mar 2005 03:44:27 -0000 1.9.6.6.16.1 +++ squid/src/fs/coss/store_io_coss.c 5 Mar 2005 20:58:59 -0000 1.9.6.6.16.2 @@ -547,7 +547,7 @@ if (errflag) { coss_stats.stripe_write.fail++; debug(79, 1) ("storeCossWriteMemBufDone: got failure (%d)\n", errflag); - debug(79, 1) ("FD %d, size=%x\n", fd, t->diskend - t->diskstart); + debug(79, 1) ("FD %d, size=%x\n", fd, (int)(t->diskend - t->diskstart)); } else { coss_stats.stripe_write.success++; }