From: wessels <>
Date: Fri, 19 May 2006 02:31:12 +0000 (+0000)
Subject: The patch for bug #1499 included debugging statments where printf tokens
X-Git-Tag: SQUID_3_0_PRE4~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d21201d9bd8d864cf8a34597dd00f9dc7cb3d26f;p=thirdparty%2Fsquid.git

The patch for bug #1499 included debugging statments where printf tokens
did not match time_t type on FreeBSD.  The time_t variables are now cast
in debugging calls.
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 39c10ad19a..8e0aa3907d 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.71 2006/05/16 05:49:44 hno Exp $
+ * $Id: external_acl.cc,v 1.72 2006/05/18 20:31:12 wessels Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -660,7 +660,7 @@ aclMatchExternal(external_acl_data *acl, ACLChecklist * ch)
         if (!entry || external_acl_grace_expired(acl->def, entry)) {
             debug(82, 2) ("aclMatchExternal: %s(\"%s\") = lookup needed\n", acl->def->name, key);
             debug(82, 2) ("aclMatchExternal: \"%s\": entry=@%p, age=%ld\n", key, entry,
-                          entry ? squid_curtime - entry->date : 0);
+                          entry ? (long int) squid_curtime - entry->date : 0);
 
             if (acl->def->theHelper->stats.queue_size <= acl->def->theHelper->n_running) {
                 debug(82, 2) ("aclMatchExternal: \"%s\": queueing a call.\n", key);
@@ -1230,7 +1230,7 @@ ACLExternal::ExternalAclLookup(ACLChecklist * ch, ACLExternal * me, EAH * callba
 
         if (entry != NULL) {
             debug(82,4) ("externalAclLookup: entry = { date=%lu, result=%d, user=%s tag=%s log=%s }\n",
-                         entry->date, entry->result, entry->user.buf(), entry->tag.buf(),
+                         (long unsigned int) entry->date, entry->result, entry->user.buf(), entry->tag.buf(),
                          entry->log.buf());
         }