From: serassio <>
Date: Sun, 3 Jul 2005 21:25:03 +0000 (+0000)
Subject: Bug #767: Problems making Squid 3.0 PRE3 64 bit
X-Git-Tag: SQUID_3_0_PRE4~710
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=137a13ea244569b00330496ed19de4f90eb9cace;p=thirdparty%2Fsquid.git

Bug #767: Problems making Squid 3.0 PRE3 64 bit

Fixed the following on HP Tru64 and probably on some other 64 bit platforms:

- assert() must test logical expressions, not pointers
- STATUS define conflict in parse.c (snmplib)
- Warnings SMB, fakeauth and MSNT helpers
- Various debug() ==> debugs() changes
- Alpha asm access to CPU profiling info
- timezone should be long, not time_t
- Various clean of ESI code
- assert() definition problem in diskd.cc
---

diff --git a/helpers/basic_auth/MSNT/smblib-util.c b/helpers/basic_auth/MSNT/smblib-util.c
index 7a8e546601..fcc7de0ae4 100644
--- a/helpers/basic_auth/MSNT/smblib-util.c
+++ b/helpers/basic_auth/MSNT/smblib-util.c
@@ -256,7 +256,6 @@ SMB_Negotiate(SMB_Handle_Type Con_Handle, const char *Prots[])
 	Con_Handle->Encrypt_Key_Len = SVAL(SMB_Hdr(pkt), SMB_negrLM_ekl_offset);
 
 	p = (SMB_Hdr(pkt) + SMB_negrLM_buf_offset);
-	fprintf(stderr, "%d", (int) (SMB_Hdr(pkt) + SMB_negrLM_buf_offset));
 	memcpy(Con_Handle->Encrypt_Key, p, 8);
 
 	p = (SMB_Hdr(pkt) + SMB_negrLM_buf_offset + Con_Handle->Encrypt_Key_Len);
diff --git a/helpers/basic_auth/MSNT/smblib.c b/helpers/basic_auth/MSNT/smblib.c
index be82e009e2..d9b202b902 100644
--- a/helpers/basic_auth/MSNT/smblib.c
+++ b/helpers/basic_auth/MSNT/smblib.c
@@ -27,6 +27,7 @@ int SMBlib_errno;
 int SMBlib_SMB_Error;
 #define SMBLIB_ERRNO
 #define uchar unsigned char
+#include "util.h"
 #include "smblib-priv.h"
 #include "smblib.h"
 #include "rfcnb-priv.h"
@@ -127,12 +128,12 @@ SMB_Connect_Server(SMB_Handle_Type Con_Handle,
      * service we are going to call, sine some servers want it in uppercase */
 
     for (i = 0; i < strlen(server); i++)
-	called[i] = toupper(server[i]);
+	called[i] = xtoupper(server[i]);
 
     called[strlen(server)] = 0;	/* Make it a string */
 
     for (i = 0; i < strlen(con->myname); i++)
-	calling[i] = toupper(con->myname[i]);
+	calling[i] = xtoupper(con->myname[i]);
 
     calling[strlen(con->myname)] = 0;	/* Make it a string */
 
@@ -229,12 +230,12 @@ SMB_Connect(SMB_Handle_Type Con_Handle,
      * service we are going to call, sine some servers want it in uppercase */
 
     for (i = 0; i < strlen(host); i++)
-	called[i] = toupper(host[i]);
+	called[i] = xtoupper(host[i]);
 
     called[strlen(host)] = 0;	/* Make it a string */
 
     for (i = 0; i < strlen(con->myname); i++)
-	calling[i] = toupper(con->myname[i]);
+	calling[i] = xtoupper(con->myname[i]);
 
     calling[strlen(con->myname)] = 0;	/* Make it a string */
 
diff --git a/helpers/ntlm_auth/SMB/ntlm_auth.c b/helpers/ntlm_auth/SMB/ntlm_auth.c
index 8bd47060e7..0ed3258907 100644
--- a/helpers/ntlm_auth/SMB/ntlm_auth.c
+++ b/helpers/ntlm_auth/SMB/ntlm_auth.c
@@ -82,7 +82,7 @@ uc(char *string)
 {
     char *p = string, c;
     while ((c = *p)) {
-	*p = toupper(c);
+	*p = xtoupper(c);
 	p++;
     }
 }
@@ -93,7 +93,7 @@ lc(char *string)
 {
     char *p = string, c;
     while ((c = *p)) {
-	*p = tolower(c);
+	*p = xtolower(c);
 	p++;
     }
 }
diff --git a/helpers/ntlm_auth/SMB/smbval/smbencrypt.c b/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
index 008b240841..41b5cbcbb1 100644
--- a/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
+++ b/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
@@ -200,7 +200,7 @@ strupper(char *s)
 	 * #endif *//* KANJI_WIN95_COMPATIBILITY */
 	{
 	    if (islower((int)(unsigned char)*s))
-		*s = toupper(*s);
+		*s = xtoupper(*s);
 	    s++;
 	}
     }
diff --git a/helpers/ntlm_auth/SMB/smbval/smblib.c b/helpers/ntlm_auth/SMB/smbval/smblib.c
index d22a01e5f0..179a6cee47 100644
--- a/helpers/ntlm_auth/SMB/smbval/smblib.c
+++ b/helpers/ntlm_auth/SMB/smbval/smblib.c
@@ -171,12 +171,12 @@ SMB_Connect_Server(SMB_Handle_Type Con_Handle,
      * service we are going to call, sine some servers want it in uppercase */
 
     for (i = 0; i < strlen(server); i++)
-	called[i] = toupper(server[i]);
+	called[i] = xtoupper(server[i]);
 
     called[strlen(server)] = 0;	/* Make it a string */
 
     for (i = 0; i < strlen(con->myname); i++)
-	calling[i] = toupper(con->myname[i]);
+	calling[i] = xtoupper(con->myname[i]);
 
     calling[strlen(con->myname)] = 0;	/* Make it a string */
 
@@ -272,12 +272,12 @@ SMB_Connect(SMB_Handle_Type Con_Handle,
      * service we are going to call, sine some servers want it in uppercase */
 
     for (i = 0; i < strlen(host); i++)
-	called[i] = toupper(host[i]);
+	called[i] = xtoupper(host[i]);
 
     called[strlen(host)] = 0;	/* Make it a string */
 
     for (i = 0; i < strlen(con->myname); i++)
-	calling[i] = toupper(con->myname[i]);
+	calling[i] = xtoupper(con->myname[i]);
 
     calling[strlen(con->myname)] = 0;	/* Make it a string */
 
diff --git a/helpers/ntlm_auth/SMB/smbval/std-includes.h b/helpers/ntlm_auth/SMB/smbval/std-includes.h
index d772c1dd75..1bd081c1eb 100644
--- a/helpers/ntlm_auth/SMB/smbval/std-includes.h
+++ b/helpers/ntlm_auth/SMB/smbval/std-includes.h
@@ -24,6 +24,7 @@
  */
 
 /* the types are provided by squid's configure preocess */
+#include "util.h"
 #define BOOL int16_t
 #define int16 int16_t
 
diff --git a/helpers/ntlm_auth/fakeauth/fakeauth_auth.c b/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
index b74a2b4bda..3421073287 100644
--- a/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
+++ b/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
@@ -57,7 +57,7 @@ lc(char *string)
 {
     char *p = string, c;
     while ((c = *p)) {
-	*p = tolower(c);
+	*p = xtolower(c);
 	p++;
     }
 }
diff --git a/include/profiling.h b/include/profiling.h
index 6766cb22bd..02f35a11e5 100644
--- a/include/profiling.h
+++ b/include/profiling.h
@@ -30,7 +30,7 @@ get_tick(void)
 {
     hrtime_t regs;
 
-asm volatile ("rpcc $0":"=A" (regs));	/* I'm not sure of syntax */
+asm volatile ("rpcc %0" : "=r" (regs));
     return regs;
 }
 
@@ -39,6 +39,7 @@ static __inline hrtime_t
 get_tick(void)
 {
     hrtime_t regs;
+
     __asm {
         cpuid
         rdtsc
diff --git a/lib/hash.c b/lib/hash.c
index 9d2b6272de..0ff9c86a9b 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: hash.c,v 1.17 2004/12/21 17:28:28 robertc Exp $
+ * $Id: hash.c,v 1.18 2005/07/03 15:25:07 serassio Exp $
  *
  * DEBUG: section 0     Hash Tables
  * AUTHOR: Harvest Derived
@@ -244,7 +244,7 @@ hash_next(hash_table * hid)
 void
 hash_last(hash_table * hid)
 {
-    assert(hid);
+    assert(hid != NULL);
     hid->next = NULL;
     hid->current_slot = 0;
 }
@@ -312,7 +312,7 @@ hashFreeItems(hash_table * hid, HASHFREE * free_func)
 void
 hashFreeMemory(hash_table * hid)
 {
-    assert(hid);
+    assert(hid != NULL);
     if (hid->buckets)
 	xfree(hid->buckets);
     xfree(hid);
diff --git a/lib/heap.c b/lib/heap.c
index 3fbc9dc03f..9daefcf213 100644
--- a/lib/heap.c
+++ b/lib/heap.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: heap.c,v 1.9 2003/01/23 00:37:01 robertc Exp $
+ * $Id: heap.c,v 1.10 2005/07/03 15:25:07 serassio Exp $
  *
  * AUTHOR: John Dilley, Hewlett Packard
  *
@@ -122,7 +122,7 @@ void
 delete_heap(heap * hp)
 {
     int i;
-    assert(hp);
+    assert(hp != NULL);
     for (i = 0; i < hp->last; i++) {
 	xfree(hp->nodes[i]);
     }
diff --git a/lib/rfc1123.c b/lib/rfc1123.c
index cb31fcac29..6ea50f7ad4 100644
--- a/lib/rfc1123.c
+++ b/lib/rfc1123.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: rfc1123.c,v 1.34 2005/03/09 20:02:06 serassio Exp $
+ * $Id: rfc1123.c,v 1.35 2005/07/03 15:25:07 serassio Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -231,7 +231,7 @@ parse_rfc1123(const char *str)
 #elif defined(_SQUID_CYGWIN_)
 #elif defined(_SQUID_MSWIN_)
 #else
-	extern time_t timezone;
+	extern long timezone;
 #endif
 	/*
 	 * The following assumes a fixed DST offset of 1 hour,
diff --git a/lib/util.c b/lib/util.c
index da822b64b0..064eab67aa 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: util.c,v 1.92 2004/12/21 17:28:28 robertc Exp $
+ * $Id: util.c,v 1.93 2005/07/03 15:25:07 serassio Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -631,7 +631,7 @@ xstrndup(const char *s, size_t n)
     size_t sz;
     void *p;
     PROF_start(xstrndup);
-    assert(s);
+    assert(s != NULL);
     assert(n);
     sz = strlen(s) + 1;
     if (sz > n)
diff --git a/snmplib/mib.c b/snmplib/mib.c
index 20b169a27e..69348ca585 100644
--- a/snmplib/mib.c
+++ b/snmplib/mib.c
@@ -128,11 +128,11 @@ lc_cmp(const char *s1, const char *s2)
 
     while (*s1 && *s2) {
 	if (xisupper(*s1))
-	    c1 = tolower(*s1);
+	    c1 = xtolower(*s1);
 	else
 	    c1 = *s1;
 	if (xisupper(*s2))
-	    c2 = tolower(*s2);
+	    c2 = xtolower(*s2);
 	else
 	    c2 = *s2;
 	if (c1 != c2)
diff --git a/snmplib/parse.c b/snmplib/parse.c
index 537e61144d..98dd796dc2 100644
--- a/snmplib/parse.c
+++ b/snmplib/parse.c
@@ -135,7 +135,7 @@ int Line = 1;
 #define	WRITEONLY   20
 #undef NOACCESS
 #define NOACCESS    21
-#define STATUS	    22
+#define SNMP_STATUS 22
 #define MANDATORY   23
 #define SNMP_OPTIONAL    24
 #define OBSOLETE    25
@@ -193,7 +193,7 @@ struct tok tokens[] =
     {"read-only", sizeof("read-only") - 1, READONLY},
     {"ACCESS", sizeof("ACCESS") - 1, ACCESS},
     {"MAX-ACCESS", sizeof("MAX-ACCESS") - 1, ACCESS},
-    {"STATUS", sizeof("STATUS") - 1, STATUS},
+    {"STATUS", sizeof("STATUS") - 1, SNMP_STATUS},
     {"SYNTAX", sizeof("SYNTAX") - 1, SYNTAX},
     {"OBJECT-TYPE", sizeof("OBJECT-TYPE") - 1, OBJTYPE},
     {"{", sizeof("{") - 1, LEFTBRACKET},
@@ -867,7 +867,7 @@ parse_objecttype(register FILE *fp, char *name)
 	return 0;
     }
     type = get_token(fp, token);
-    if (type != STATUS) {
+    if (type != SNMP_STATUS) {
 	print_error("Should be STATUS", token, nexttype);
 	free_node(np);
 	return 0;
diff --git a/src/DiskIO/DiskDaemon/diskd.cc b/src/DiskIO/DiskDaemon/diskd.cc
index 4ff44af369..9eacbb3c2e 100644
--- a/src/DiskIO/DiskDaemon/diskd.cc
+++ b/src/DiskIO/DiskDaemon/diskd.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: diskd.cc,v 1.2 2004/12/21 15:47:33 robertc Exp $
+ * $Id: diskd.cc,v 1.3 2005/07/03 15:25:09 serassio Exp $
  *
  * DEBUG: section --    External DISKD process implementation.
  * AUTHOR: Harvest Derived
@@ -41,9 +41,13 @@
 
 #include "DiskIO/DiskDaemon/diomsg.h"
 
-#undef assert
-#include <assert.h>
+void
+xassert(const char *msg, const char *file, int line)
+{
+    fprintf(stderr,"assertion failed: %s:%d: \"%s\"\n", file, line, msg);
 
+    abort();
+}
 
 const int diomsg::msg_snd_rcv_sz = sizeof(diomsg) - sizeof(mtyp_t);
 #define DEBUG(LEVEL) if ((LEVEL) <= DebugLevel)
diff --git a/src/ESI.cc b/src/ESI.cc
index 91fe165527..84e0a31ef9 100644
--- a/src/ESI.cc
+++ b/src/ESI.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESI.cc,v 1.14 2005/06/03 15:24:14 serassio Exp $
+ * $Id: ESI.cc,v 1.15 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -688,7 +688,7 @@ ESIContext::send ()
 
     cbdataReferenceDone (templock);
 
-    debug (86,5)("ESIContext::send: this=%p sent %d\n",this,len);
+    debugs (86,5,"ESIContext::send: this=" << this << " sent " << len);
 
     return len;
 }
@@ -785,7 +785,7 @@ esiProcessStream (clientStreamNode *thisNode, clientHttpRequest *http, HttpReply
         /* Increase our buffer area with incoming data */
         assert (recievedData.length <= HTTP_REQBUF_SZ);
         assert (thisNode->readBuffer.offset == recievedData.offset);
-        debug (86,5)("esiProcessStream found %u bytes of body data at offset %ld\n", recievedData.length, (long)recievedData.offset);
+        debugs (86,5, "esiProcessStream found " << recievedData.length << " bytes of body data at offset " << recievedData.offset);
         /* secure the data for later use */
 
         if (!context->incoming.getRaw()) {
@@ -1187,7 +1187,7 @@ ESIContext::parserComment (const char *s)
             debug (86,0)("ESIContext::parserComment: Parsing fragment '%s' failed.\n", s + 3);
             setError();
             char tempstr[1024];
-            snprintf(tempstr, 1023, "ESIContext::parserComment: Parse error at line %d:\n%s\n",
+            snprintf(tempstr, 1023, "ESIContext::parserComment: Parse error at line %ld:\n%s\n",
                      tempParser->lineNumber(),
                      tempParser->errorString());
             debug (86,0)("%s",tempstr);
@@ -1243,13 +1243,13 @@ ESIContext::parseOneBuffer()
 {
     assert (buffered.getRaw());
 
-    debug (86,9)("ESIContext::parseOneBuffer: %d bytes\n",buffered->len);
+    debugs (86,9,"ESIContext::parseOneBuffer: " << buffered->len << " bytes");
     bool lastBlock = buffered->next.getRaw() == NULL && flags.finishedtemplate ? true : false;
 
     if (! parserState.theParser->parse(buffered->buf, buffered->len, lastBlock)) {
         setError();
         char tempstr[1024];
-        snprintf (tempstr, 1023, "esiProcess: Parse error at line %d:\n%s\n",
+        snprintf (tempstr, 1023, "esiProcess: Parse error at line %ld:\n%s\n",
                   parserState.theParser->lineNumber(),
                   parserState.theParser->errorString());
         debug (86,0)("%s", tempstr);
@@ -2060,13 +2060,13 @@ esiChoose::addElement(ESIElement::Pointer element)
     } else {
         elements.push_back (element);
 
-        debug (86,3)("esiChooseAdd: Added a new element, elements = %d\n", elements.size());
+        debugs (86,3, "esiChooseAdd: Added a new element, elements = " << elements.size());
 
         if (chosenelement == -1)
             if ((dynamic_cast<esiWhen *>(element.getRaw()))->
                     testsTrue()) {
                 chosenelement = elements.size() - 1;
-                debug (86,3)("esiChooseAdd: Chose element %d\n", elements.size());
+                debugs (86,3, "esiChooseAdd: Chose element " << elements.size());
             }
     }
 
@@ -2083,7 +2083,7 @@ esiChoose::selectElement()
         if ((dynamic_cast<esiWhen *>(elements[counter].getRaw()))->
                 testsTrue()) {
             chosenelement = counter;
-            debug (86,3)("esiChooseAdd: Chose element %d\n", counter + 1);
+            debugs (86,3, "esiChooseAdd: Chose element " << counter + 1);
             return;
         }
     }
diff --git a/src/ESICustomParser.cc b/src/ESICustomParser.cc
index 3e98703759..1badccf325 100644
--- a/src/ESICustomParser.cc
+++ b/src/ESICustomParser.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESICustomParser.cc,v 1.6 2005/03/28 21:44:12 hno Exp $
+ * $Id: ESICustomParser.cc,v 1.7 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -51,14 +51,20 @@ ESICustomParser::GetTrie()
 
     SearchTrie = new Trie(new TrieCaseless);
 
+    static const ESITAG_t ESITAG_value = ESITAG;
+
     assert (SearchTrie->add
-            ("<esi:",5,(void *)ESITAG));
+            ("<esi:",5,(void *)&ESITAG_value));
+
+    static const ESITAG_t ESIENDTAG_value = ESIENDTAG;
 
     assert (SearchTrie->add
-            ("</esi:",6,(void *)ESIENDTAG));
+            ("</esi:",6,(void *)&ESIENDTAG_value));
+
+    static const ESITAG_t ESICOMMENT_value = ESICOMMENT;
 
     assert (SearchTrie->add
-            ("<!--",4,(void *)ESICOMMENT));
+            ("<!--",4,(void *)&ESICOMMENT_value));
 
     return SearchTrie;
 }
@@ -75,19 +81,19 @@ char const *
 ESICustomParser::findTag(char const *buffer, size_t bufferLength)
 {
     size_t myOffset (0);
-    void *resulttype = NULL;
+    ESITAG_t *resulttype = NULL;
 
     while (myOffset < bufferLength &&
-            (resulttype =GetTrie()->findPrefix (buffer + myOffset, bufferLength - myOffset)) == NULL)
+            (resulttype = static_cast<ESITAG_t *>(GetTrie()->findPrefix (buffer + myOffset, bufferLength - myOffset)))
+            == NULL)
         ++myOffset;
 
     if (myOffset == bufferLength)
         return NULL;
 
-    debug (86,9)("ESICustomParser::findTag: found %p\n", resulttype);
+    debug (86,9)("ESICustomParser::findTag: found %d\n", *resulttype);
 
-    /* Yuck! */
-    lastTag = static_cast<ESITAG_t>((int)resulttype);
+    lastTag = *resulttype;
 
     return buffer + myOffset;
 }
@@ -285,7 +291,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
     return !openESITags;
 }
 
-size_t
+long int
 ESICustomParser::lineNumber() const
 {
     /* We don't track lines in the body */
diff --git a/src/ESICustomParser.h b/src/ESICustomParser.h
index d3de621575..a1a00aaf59 100644
--- a/src/ESICustomParser.h
+++ b/src/ESICustomParser.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ESICustomParser.h,v 1.5 2005/03/28 21:44:12 hno Exp $
+ * $Id: ESICustomParser.h,v 1.6 2005/07/03 15:25:08 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -45,7 +45,7 @@ public:
     ~ESICustomParser();
     /* true on success */
     bool parse(char const *dataToParse, size_t const lengthOfData, bool const endOfStream);
-    size_t lineNumber() const;
+    long int lineNumber() const;
     char const * errorString() const;
 
 private:
diff --git a/src/ESIExpatParser.cc b/src/ESIExpatParser.cc
index 71b46c7369..f210b0c4d1 100644
--- a/src/ESIExpatParser.cc
+++ b/src/ESIExpatParser.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIExpatParser.cc,v 1.3 2005/03/28 21:44:12 hno Exp $
+ * $Id: ESIExpatParser.cc,v 1.4 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -93,10 +93,10 @@ ESIExpatParser::parse(char const *dataToParse, size_t const lengthOfData, bool c
     return XML_Parse(myParser(), dataToParse, lengthOfData, endOfStream);
 }
 
-size_t
+long int
 ESIExpatParser::lineNumber() const
 {
-    return XML_GetCurrentLineNumber(myParser());
+    return (long int)XML_GetCurrentLineNumber(myParser());
 }
 
 char const *
diff --git a/src/ESIExpatParser.h b/src/ESIExpatParser.h
index 5be5f81815..29d84770e0 100644
--- a/src/ESIExpatParser.h
+++ b/src/ESIExpatParser.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ESIExpatParser.h,v 1.3 2005/03/28 21:44:12 hno Exp $
+ * $Id: ESIExpatParser.h,v 1.4 2005/07/03 15:25:08 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -44,7 +44,7 @@ public:
     ~ESIExpatParser();
     /* true on success */
     bool parse(char const *dataToParse, size_t const lengthOfData, bool const endOfStream);
-    size_t lineNumber() const;
+    long int lineNumber() const;
     char const * errorString() const;
 
 private:
diff --git a/src/ESIExpression.cc b/src/ESIExpression.cc
index 288473cb80..63197cc7d8 100644
--- a/src/ESIExpression.cc
+++ b/src/ESIExpression.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIExpression.cc,v 1.3 2003/07/14 14:15:56 robertc Exp $
+ * $Id: ESIExpression.cc,v 1.4 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -728,7 +728,7 @@ getsymbol (const char *s, char const **endptr)
                 debug (86,1) ("failed to convert '%s' to float \n", s);
                 *endptr = origs;
             } else {
-                debug (86,6) ("found %f of length %d\n",rv.value.floating, end - s);
+                debugs (86,6, "found " << rv.value.floating << " of length " << end - s);
                 *endptr = end;
                 rv.eval = evalliteral;
                 rv.valuestored = ESI_LITERAL_FLOAT;
@@ -744,7 +744,7 @@ getsymbol (const char *s, char const **endptr)
                 debug (86,1) ("failed to convert '%s' to int \n", s);
                 *endptr = origs;
             } else {
-                debug (86,6) ("found %d of length %d\n",rv.value.integral, end - s);
+                debugs (86,6, "found " << rv.value.integral << " of length " << end - s);
                 *endptr = end;
                 rv.eval = evalliteral;
                 rv.valuestored = ESI_LITERAL_INT;
diff --git a/src/ESIInclude.cc b/src/ESIInclude.cc
index b8e45acc68..b07b60a3b0 100644
--- a/src/ESIInclude.cc
+++ b/src/ESIInclude.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIInclude.cc,v 1.5 2004/12/21 17:28:29 robertc Exp $
+ * $Id: ESIInclude.cc,v 1.6 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -91,7 +91,7 @@ esiBufferRecipient (clientStreamNode *node, clientHttpRequest *http, HttpReply *
     assert (recievedData.length <= sizeof(esiStream->localbuffer->buf));
     assert (!esiStream->finished);
 
-    debug (86,5) ("esiBufferRecipient rep %p body %p len %d\n", rep, recievedData.data, recievedData.length);
+    debugs (86,5, "esiBufferRecipient rep " << rep << " body " << recievedData.data << " len " << recievedData.length);
     assert (node->readBuffer.offset == recievedData.offset || recievedData.length == 0);
 
     /* trivial case */
diff --git a/src/ESILibxml2Parser.cc b/src/ESILibxml2Parser.cc
index f32c330371..3373e5c9c6 100644
--- a/src/ESILibxml2Parser.cc
+++ b/src/ESILibxml2Parser.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ESILibxml2Parser.cc,v 1.2 2005/03/28 21:44:12 hno Exp $
+ * $Id: ESILibxml2Parser.cc,v 1.3 2005/07/03 15:25:08 serassio Exp $
  *
  * AUTHOR: Joachim Bauch (mail@joachim-bauch.de)
  *
@@ -138,10 +138,10 @@ ESILibxml2Parser::parse(char const *dataToParse, size_t const lengthOfData, bool
     return (xmlParseChunk(parser, dataToParse, lengthOfData, endOfStream) == 0);
 }
 
-size_t
+long int
 ESILibxml2Parser::lineNumber() const
 {
-    return xmlSAX2GetLineNumber(parser);
+    return (long int)xmlSAX2GetLineNumber(parser);
 }
 
 char const *
diff --git a/src/ESILibxml2Parser.h b/src/ESILibxml2Parser.h
index 6a4bef5691..1fe1747747 100644
--- a/src/ESILibxml2Parser.h
+++ b/src/ESILibxml2Parser.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ESILibxml2Parser.h,v 1.2 2005/03/28 21:44:12 hno Exp $
+ * $Id: ESILibxml2Parser.h,v 1.3 2005/07/03 15:25:08 serassio Exp $
  *
  * AUTHOR: Joachim Bauch (mail@joachim-bauch.de)
  *
@@ -63,7 +63,7 @@ public:
     ~ESILibxml2Parser();
     /* true on success */
     bool parse(char const *dataToParse, size_t const lengthOfData, bool const endOfStream);
-    size_t lineNumber() const;
+    long int lineNumber() const;
     char const * errorString() const;
 
     ESIParserClient *getClient() { return theClient; }
diff --git a/src/ESIParser.h b/src/ESIParser.h
index d76c179388..f0575ea9a4 100644
--- a/src/ESIParser.h
+++ b/src/ESIParser.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ESIParser.h,v 1.4 2005/04/30 19:32:01 serassio Exp $
+ * $Id: ESIParser.h,v 1.5 2005/07/03 15:25:08 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -55,7 +55,7 @@ public:
     static char *Type;
     /* true on success */
     virtual bool parse(char const *dataToParse, size_t const lengthOfData, bool const endOfStream) = 0;
-    virtual size_t lineNumber() const =0;
+    virtual long int lineNumber() const =0;
     virtual char const * errorString() const =0;
 
 protected:
diff --git a/src/ESISequence.cc b/src/ESISequence.cc
index 9c4bbe1923..72af794ca4 100644
--- a/src/ESISequence.cc
+++ b/src/ESISequence.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ESISequence.cc,v 1.4 2004/08/30 05:12:31 robertc Exp $
+ * $Id: ESISequence.cc,v 1.5 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -90,7 +90,7 @@ esiSequence::render(ESISegment::Pointer output)
      * and rendered elements 
      */
     assert (output->next == NULL);
-    debug (86,5)("esiSequenceRender: rendering %d elements\n", processedcount);
+    debugs (86,5, "esiSequenceRender: rendering " << processedcount << " elements");
 
     for (size_t i = 0; i < processedcount; ++i) {
         elements[i]->render(output);
@@ -173,7 +173,7 @@ esiSequence::addElement (ESIElement::Pointer element)
     }
 
     elements.push_back(element);
-    debug (86,3)("esiSequenceAdd: Added a new element, elements = %d\n", elements.size());
+    debugs (86,3, "esiSequenceAdd: Added a new element, elements = " << elements.size());
     return true;
 }
 
@@ -203,7 +203,7 @@ esiSequence::processStep(int dovars)
 esiProcessResult_t
 esiSequence::processOne(int dovars, size_t index)
 {
-    debug (86,5)("esiSequence::process %p about to process element[%d] %p\n", this, index, elements[index].getRaw());
+    debugs (86,5, "esiSequence::process " << this << " about to process element[" << index << "] " << elements[index].getRaw());
 
     switch (elements[index]->process(dovars)) {
 
diff --git a/src/ESIVarState.cc b/src/ESIVarState.cc
index 8c82fcbdad..511989f226 100644
--- a/src/ESIVarState.cc
+++ b/src/ESIVarState.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIVarState.cc,v 1.4 2005/01/06 13:16:39 serassio Exp $
+ * $Id: ESIVarState.cc,v 1.5 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -129,7 +129,7 @@ void
 ESIVarState::feedData (const char *buf, size_t len)
 {
     /* TODO: if needed - tune to skip segment iteration */
-    debug (86,6)("esiVarState::feedData: accepting %d bytes\n", len);
+    debugs (86,6, "esiVarState::feedData: accepting " << len << " bytes");
     ESISegment::ListAppend (input, buf, len);
 }
 
diff --git a/src/StoreHashIndex.h b/src/StoreHashIndex.h
index a34f0cb17b..ec26669658 100644
--- a/src/StoreHashIndex.h
+++ b/src/StoreHashIndex.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: StoreHashIndex.h,v 1.1 2005/01/03 16:08:25 robertc Exp $
+ * $Id: StoreHashIndex.h,v 1.2 2005/07/03 15:25:08 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -75,7 +75,7 @@ public:
 
     virtual void maintain();
 
-    virtual void updateSize(unsigned int, int);
+    virtual void updateSize(size_t, int);
 
     virtual StoreSearch *search(String const url, HttpRequest *);
 
diff --git a/src/htcp.cc b/src/htcp.cc
index 870d7d5e6b..1aecd5b943 100644
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: htcp.cc,v 1.57 2004/08/30 05:12:31 robertc Exp $
+ * $Id: htcp.cc,v 1.58 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 31    Hypertext Caching Protocol
  * AUTHOR: Duane Wesssels
@@ -305,7 +305,7 @@ htcpBuildCountstr(char *buf, size_t buflen, const char *s)
     else
         len = 0;
 
-    debug(31, 3) ("htcpBuildCountstr: LENGTH = %d\n", len);
+    debugs(31, 3, "htcpBuildCountstr: LENGTH = " << len);
 
     debug(31, 3) ("htcpBuildCountstr: TEXT = {%s}\n", s ? s : "<NULL>");
 
diff --git a/src/mem.cc b/src/mem.cc
index aaebd7186e..7cecb83060 100644
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mem.cc,v 1.85 2004/08/30 05:12:31 robertc Exp $
+ * $Id: mem.cc,v 1.86 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 13    High Level Memory Pool Management
  * AUTHOR: Harvest Derived
@@ -397,7 +397,7 @@ Mem::Init(void)
         StrPools[i].pool = MemPools::GetInstance().create(StrPoolsAttrs[i].name, StrPoolsAttrs[i].obj_size);
 
         if (StrPools[i].pool->objectSize() != StrPoolsAttrs[i].obj_size)
-            debug(13, 1) ("Notice: %s is %d bytes instead of requested %d bytes\n", StrPoolsAttrs[i].name, StrPoolsAttrs[i].obj_size, StrPoolsAttrs[i].obj_size);
+            debugs(13, 1, "Notice: " << StrPoolsAttrs[i].name << " is " << StrPoolsAttrs[i].obj_size << " bytes instead of requested " << StrPoolsAttrs[i].obj_size << " bytes");
     }
 
     cachemgrRegister("mem",
diff --git a/src/net_db.cc b/src/net_db.cc
index cfebca6745..ea3a05b3ca 100644
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.176 2005/04/18 21:52:42 hno Exp $
+ * $Id: net_db.cc,v 1.177 2005/07/03 15:25:08 serassio Exp $
  *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -710,7 +710,7 @@ netdbExchangeHandleReply(void *data, StoreIOBuffer recievedData)
 
     /* Get the size of the buffer now */
     size = ex->buf_ofs + recievedData.length;
-    debug(38, 3) ("netdbExchangeHandleReply: %d bytes buf\n", (int) size);
+    debugs(38, 3, "netdbExchangeHandleReply: " << size << " bytes buf");
 
     /* Check if we're still doing headers */
 
@@ -721,7 +721,7 @@ netdbExchangeHandleReply(void *data, StoreIOBuffer recievedData)
         /* skip reply headers */
 
         if ((hdr_sz = headersEnd(p, ex->buf_ofs))) {
-            debug(38, 5) ("netdbExchangeHandleReply: hdr_sz = %d\n", hdr_sz);
+            debugs(38, 5, "netdbExchangeHandleReply: hdr_sz = " << hdr_sz);
             rep = ex->e->getReply();
             assert (0 != rep->sline.status);
             debug(38, 3) ("netdbExchangeHandleReply: reply status %d\n",
diff --git a/src/squid.h b/src/squid.h
index c6b9fafbab..0e922721ee 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.246 2005/06/03 15:00:55 serassio Exp $
+ * $Id: squid.h,v 1.247 2005/07/03 15:25:08 serassio Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -471,6 +471,12 @@ void free(V x) { fatal("Do not use ::free()"); }
 #ifndef PRIu64 /* ISO C99 Standard printf() macro for 64 bit unsigned int */
 #ifdef _SQUID_MSWIN_ /* Windows native port using MSVCRT */
 #define PRIu64 "I64u"
+/* FIXME: Temporary hack to allow the build on Digital/Compaq/HP Tru64 Unix.
+   Long term solution: add type size detect in configure like Squid 2.5 and
+   define PRIu64 according to the size of long int and int64_t.      
+ */
+#elif defined(__alpha) && defined(_SQUID_OSF_)
+#define PRIu64 "lu"
 #else
 #define PRIu64 "llu"
 #endif /* _SQUID_MSWIN_ */
diff --git a/src/store_dir.cc b/src/store_dir.cc
index 5a572f1e6d..896e86cd8b 100644
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir.cc,v 1.150 2005/01/03 16:08:26 robertc Exp $
+ * $Id: store_dir.cc,v 1.151 2005/07/03 15:25:09 serassio Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -859,7 +859,7 @@ StoreHashIndex::maintain()
 }
 
 void
-StoreHashIndex::updateSize(unsigned int, int)
+StoreHashIndex::updateSize(size_t, int)
 {}
 
 void