---------------------
PatchSet 4284 
Date: 2007/04/19 05:05:11
Author: dwsquid
Branch: squid3-largeobj
Tag: (none) 
Log:
Couple of fixes to compile successfully on Linux

Members: 
	src/ftp.cc:1.63.2.2->1.63.2.3 
	src/store_client.cc:1.29.2.1->1.29.2.2 

Index: squid3/src/ftp.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ftp.cc,v
retrieving revision 1.63.2.2
retrieving revision 1.63.2.3
diff -u -r1.63.2.2 -r1.63.2.3
--- squid3/src/ftp.cc	19 Apr 2007 04:45:55 -0000	1.63.2.2
+++ squid3/src/ftp.cc	19 Apr 2007 05:05:11 -0000	1.63.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.63.2.2 2007/04/19 04:45:55 dwsquid Exp $
+ * $Id: ftp.cc,v 1.63.2.3 2007/04/19 05:05:11 dwsquid Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -1720,7 +1720,11 @@
         return;
     }
 
-    assert(ftpState->ctrl.offset < ftpState->ctrl.size);
+    /*
+     * Cast is necessary because off_t and size_t are not always of
+     * same signedness.
+     */
+    assert(ftpState->ctrl.offset < (off_t) ftpState->ctrl.size);
 
     if (errflag == COMM_OK && len > 0) {
         fd_bytes(fd, len, FD_READ);
@@ -1771,7 +1775,7 @@
     if (ctrl.message == NULL) {
         /* didn't get complete reply yet */
 
-        if (ctrl.offset == ctrl.size) {
+        if (ctrl.offset == (off_t) ctrl.size) {
             ctrl.buf = (char *)memReallocBuf(ctrl.buf, ctrl.size << 1, &ctrl.size);
         }
 
Index: squid3/src/store_client.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/store_client.cc,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -r1.29.2.1 -r1.29.2.2
--- squid3/src/store_client.cc	18 Apr 2007 05:07:20 -0000	1.29.2.1
+++ squid3/src/store_client.cc	19 Apr 2007 05:05:19 -0000	1.29.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.cc,v 1.29.2.1 2007/04/18 05:07:20 dwsquid Exp $
+ * $Id: store_client.cc,v 1.29.2.2 2007/04/19 05:05:19 dwsquid Exp $
  *
  * DEBUG: section 90    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -341,7 +341,7 @@
     flags.store_copying = 1;
     MemObject *mem = entry->mem_obj;
 
-    debug(33, 5)("store_client::doCopy: co: %lld, hi: %lld\n", copyInto.offset, mem->endOffset());
+    debugs(33, 5, "store_client::doCopy: co: " << copyInto.offset << " hi: " << mem->endOffset());
 
     if (storeClientNoMoreToSend(entry, this)) {
         /* There is no more to send! */