--------------------- PatchSet 5121 Date: 2007/08/01 07:14:34 Author: chtsanti Branch: squid3-largeobj Tag: (none) Log: - use PRIu64 instead of PRId64 for uint64 types in printf like functions - Removing some of (int64_t) castings where does not really needed as Henrik sugested Members: src/BodyPipe.cc:1.2.10.2->1.2.10.3 src/MemObject.cc:1.22.6.5->1.22.6.6 src/store_client.cc:1.29.2.9->1.29.2.10 Index: squid3/src/BodyPipe.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/BodyPipe.cc,v retrieving revision 1.2.10.2 retrieving revision 1.2.10.3 diff -u -r1.2.10.2 -r1.2.10.3 --- squid3/src/BodyPipe.cc 18 Jun 2007 20:59:34 -0000 1.2.10.2 +++ squid3/src/BodyPipe.cc 1 Aug 2007 07:14:34 -0000 1.2.10.3 @@ -290,7 +290,7 @@ buf.append(" [", 2); - buf.Printf("%"PRId64"<=%"PRId64, (int64_t)theGetSize, (int64_t)thePutSize); + buf.Printf("%"PRIu64"<=%"PRIu64, theGetSize, thePutSize); if (theBodySize >= 0) buf.Printf("<=%"PRId64, theBodySize); else Index: squid3/src/MemObject.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/MemObject.cc,v retrieving revision 1.22.6.5 retrieving revision 1.22.6.6 diff -u -r1.22.6.5 -r1.22.6.6 --- squid3/src/MemObject.cc 31 Jul 2007 21:09:45 -0000 1.22.6.5 +++ squid3/src/MemObject.cc 1 Aug 2007 07:14:34 -0000 1.22.6.6 @@ -1,6 +1,6 @@ /* - * $Id: MemObject.cc,v 1.22.6.5 2007/07/31 21:09:45 chtsanti Exp $ + * $Id: MemObject.cc,v 1.22.6.6 2007/08/01 07:14:34 chtsanti Exp $ * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Robert Collins @@ -268,7 +268,7 @@ bool MemObject::readAheadPolicyCanRead() const { - return endOffset() - (int64_t)getReply()->hdr_sz < lowestMemReaderOffset() + ((int64_t)Config.readAheadGap << 10); + return endOffset() - getReply()->hdr_sz < lowestMemReaderOffset() + (Config.readAheadGap << 10); } void Index: squid3/src/store_client.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/store_client.cc,v retrieving revision 1.29.2.9 retrieving revision 1.29.2.10 diff -u -r1.29.2.9 -r1.29.2.10 --- squid3/src/store_client.cc 31 Jul 2007 21:09:47 -0000 1.29.2.9 +++ squid3/src/store_client.cc 1 Aug 2007 07:14:34 -0000 1.29.2.10 @@ -1,6 +1,6 @@ /* - * $Id: store_client.cc,v 1.29.2.9 2007/07/31 21:09:47 chtsanti Exp $ + * $Id: store_client.cc,v 1.29.2.10 2007/08/01 07:14:34 chtsanti Exp $ * * DEBUG: section 90 Storage Manager Client-Side Interface * AUTHOR: Duane Wessels @@ -790,7 +790,7 @@ return 0; } - if ((expectlen - curlen) > ((int64_t)Config.quickAbort.max << 10)) { + if ((expectlen - curlen) > (Config.quickAbort.max << 10)) { debugs(90, 3, "CheckQuickAbort2: YES too much left to go"); return 1; } @@ -800,7 +800,7 @@ return 0; } - if ((curlen / (expectlen / 100)) > ((int64_t)Config.quickAbort.pct)) { + if ((curlen / (expectlen / 100)) > (Config.quickAbort.pct)) { debugs(90, 3, "CheckQuickAbort2: NO past point of no return"); return 0; }