--------------------- PatchSet 6459 Date: 2005/03/03 01:31:16 Author: hno Branch: lfs-2_5 Tag: (none) Log: More filedescriptor related stat fixes Members: src/stat.c:1.13.6.11.2.1->1.13.6.11.2.2 Index: squid/src/stat.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/stat.c,v retrieving revision 1.13.6.11.2.1 retrieving revision 1.13.6.11.2.2 diff -u -r1.13.6.11.2.1 -r1.13.6.11.2.2 --- squid/src/stat.c 3 Mar 2005 01:28:49 -0000 1.13.6.11.2.1 +++ squid/src/stat.c 3 Mar 2005 01:31:16 -0000 1.13.6.11.2.2 @@ -1,6 +1,6 @@ /* - * $Id: stat.c,v 1.13.6.11.2.1 2005/03/03 01:28:49 hno Exp $ + * $Id: stat.c,v 1.13.6.11.2.2 2005/03/03 01:31:16 hno Exp $ * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived @@ -432,7 +432,7 @@ f = &fd_table[i]; if (!f->flags.open) continue; - storeAppendPrintf(sentry, "%4d %-6.6s %4"PRINTF_OFF_T" %7"PRINTF_OFF_T"%c %7d%c %-21s %s\n", + storeAppendPrintf(sentry, "%4d %-6.6s %4d %7"PRINTF_OFF_T"%c %7"PRINTF_OFF_T"%c %-21s %s\n", i, fdTypeStr[f->type], f->timeout_handler ? (int) (f->timeout - squid_curtime) / 60 : 0, @@ -1421,7 +1421,7 @@ storeAppendPrintf(s, "Connection: %p\n", conn); if (conn) { fd = conn->fd; - storeAppendPrintf(s, "\tFD %d, read %d, wrote %d\n", fd, + storeAppendPrintf(s, "\tFD %d, read %"PRINTF_OFF_T", wrote %"PRINTF_OFF_T"\n", fd, fd_table[fd].bytes_read, fd_table[fd].bytes_written); storeAppendPrintf(s, "\tFD desc: %s\n", fd_table[fd].desc); storeAppendPrintf(s, "\tin: buf %p, offset %ld, size %ld\n",