File 10821.patch of Package squid-beta
---------------------
PatchSet 10821
Date: 2007/05/22 01:15:55
Author: hno
Branch: HEAD
Tag: (none)
Log:
SqString.cc:198: error: cannot convert 'unsigned int*' to 'size_t*' for argument '2' to 'void* memAllocString(size_t, size_t*)'
Members:
src/SqString.cc:1.6->1.7
Index: squid3/src/SqString.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/SqString.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- squid3/src/SqString.cc 20 May 2007 08:29:44 -0000 1.6
+++ squid3/src/SqString.cc 22 May 2007 01:15:55 -0000 1.7
@@ -1,6 +1,6 @@
/*
- * $Id: SqString.cc,v 1.6 2007/05/20 08:29:44 amosjeffries Exp $
+ * $Id: SqString.cc,v 1.7 2007/05/22 01:15:55 hno Exp $
*
* DEBUG: section 67 String
* AUTHOR: Duane Wessels
@@ -193,8 +193,8 @@
xmemcpy(buf_+len_, str, len);
len_ += len;
} else {
- unsigned int ssz = len_ + len;
- unsigned int bsz = len_ + len + 1;
+ size_t ssz = len_ + len;
+ size_t bsz = len_ + len + 1;
char* tmp = (char *)memAllocString(bsz, &bsz);
assert(bsz < 65536);
assert(bsz > ssz);