First batch of format error fixes

diff --git a/snmplib/snmp_msg.c b/snmplib/snmp_msg.c
index e694ef5e2a15c544bd1f3030c6dc468a595544a1..bec7625245d2f0797963e6e38e64eb1d6bb765df 100644 (file)
--- a/snmplib/snmp_msg.c
+++ b/snmplib/snmp_msg.c
@@ -136,7 +136,7 @@ snmp_msg_Encode(u_char * Buffer, int *BufLenP,
     u_char *MsgPtr;
     int FakeArg = 1024;
 
-    snmplib_debug(4, "Buffer=%x BufLenP=%x, buflen=%d\n", Buffer, BufLenP,
+    snmplib_debug(4, "Buffer=%p BufLenP=%p, buflen=%d\n", Buffer, BufLenP,
        *BufLenP);
     /* Header for the entire thing, with a false, large length */
     bufp = asn_build_header(Buffer, BufLenP,
@@ -176,7 +176,7 @@ snmp_msg_Encode(u_char * Buffer, int *BufLenP,
     /* A nice header for this PDU. 
      * Encoded with the wrong length.  We'll fix it later.
      */
-    snmplib_debug(8, "snmp_msg_Encode:Encoding PDU Header at 0x%x (fake len %d) (%d bytes so far)\n",
+    snmplib_debug(8, "snmp_msg_Encode:Encoding PDU Header at 0x%p (fake len %d) (%d bytes so far)\n",
        bufp, *BufLenP, *BufLenP);
     PDUHeaderPtr = bufp;
     bufp = asn_build_header(bufp, BufLenP,

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index e4d4d4c37fee341f9edca9b831ccf85f63c8d3f7..b45faa261f46d50a5425ce23b5cf474d768febec 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: auth_basic.cc,v 1.13 2001/10/17 19:43:40 hno Exp $
+ * $Id: auth_basic.cc,v 1.14 2001/10/24 05:26:12 hno Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Duane Wessels
@@ -308,7 +308,7 @@ authBasicCfgDump(StoreEntry * entry, const char *name, authScheme * scheme)
     storeAppendPrintf(entry, "\n%s %s realm %s\n%s %s children %d\n%s %s credentialsttl %d seconds\n",
        name, "basic", config->basicAuthRealm,
        name, "basic", config->authenticateChildren,
-       name, "basic", config->credentialsTTL);
+       name, "basic", (int)config->credentialsTTL);
 
 }
 
@@ -505,7 +505,7 @@ authenticateBasicDecodeAuth(auth_user_request_t * auth_user_request, const char
        /* store user in hash */
        authenticateUserNameCacheAdd(auth_user);
     } else {
-       debug(29, 9) ("authBasicDecodeAuth: Found user '%s' in the user cache as '%d'\n", local_basic.username, auth_user);
+       debug(29, 9) ("authBasicDecodeAuth: Found user '%s' in the user cache as '%p'\n", local_basic.username, auth_user);
        xfree(local_basic.username);
        basic_auth = auth_user->scheme_data;
        if (strcmp(local_basic.passwd, basic_auth->passwd)) {

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index f3a8661d7a390a7442819110b4a5d42f924e36cc..fc9bd17158bdfad67dbb4d9a072ef2faf138df49 100644 (file)
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_digest.cc,v 1.9 2001/10/17 19:43:41 hno Exp $
+ * $Id: auth_digest.cc,v 1.10 2001/10/24 05:26:14 hno Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Robert Collins
@@ -190,7 +190,7 @@ authenticateDigestNonceNew(void)
     /* the cache's link */
     authDigestNonceLink(newnonce);
     newnonce->flags.incache = 1;
-    debug(29, 5) ("authenticateDigestNonceNew: created nonce %0p at %d\n", newnonce, newnonce->noncedata.creationtime);
+    debug(29, 5) ("authenticateDigestNonceNew: created nonce %p at %ld\n", newnonce, (long int)newnonce->noncedata.creationtime);
     return newnonce;
 }
 
@@ -260,14 +260,14 @@ authenticateDigestNonceCacheCleanup(void *data)
      */
     digest_nonce_h *nonce;
     debug(29, 3) ("authenticateDigestNonceCacheCleanup: Cleaning the nonce cache now\n");
-    debug(29, 3) ("authenticateDigestNonceCacheCleanup: Current time: %d\n",
-       current_time.tv_sec);
+    debug(29, 3) ("authenticateDigestNonceCacheCleanup: Current time: %ld\n",
+       (long int)current_time.tv_sec);
     hash_first(digest_nonce_cache);
     while ((nonce = ((digest_nonce_h *) hash_next(digest_nonce_cache)))) {
-       debug(29, 3) ("authenticateDigestNonceCacheCleanup: nonce entry  : '%s'\n", nonce->hash.key);
-       debug(29, 4) ("authenticateDigestNonceCacheCleanup: Creation time: %d\n", nonce->noncedata.creationtime);
+       debug(29, 3) ("authenticateDigestNonceCacheCleanup: nonce entry  : %p '%s'\n", nonce, (char *)nonce->hash.key);
+       debug(29, 4) ("authenticateDigestNonceCacheCleanup: Creation time: %ld\n", (long int)nonce->noncedata.creationtime);
        if (authDigestNonceIsStale(nonce)) {
-           debug(29, 4) ("authenticateDigestNonceCacheCleanup: Removing nonce %s from cache due to timeout.\n", nonce->hash.key);
+           debug(29, 4) ("authenticateDigestNonceCacheCleanup: Removing nonce %s from cache due to timeout.\n", (char *)nonce->hash.key);
            assert(nonce->flags.incache);
            /* invalidate nonce so future requests fail */
            nonce->flags.valid = 0;
@@ -286,7 +286,7 @@ authDigestNonceLink(digest_nonce_h * nonce)
 {
     assert(nonce != NULL);
     nonce->references++;
-    debug(29, 9) ("authDigestNonceLink: nonce '%d' now at '%d'.\n", nonce, nonce->references);
+    debug(29, 9) ("authDigestNonceLink: nonce '%p' now at '%d'.\n", nonce, nonce->references);
 }
 
 #if NOT_USED
@@ -306,9 +306,9 @@ authDigestNonceUnlink(digest_nonce_h * nonce)
     if (nonce->references > 0) {
        nonce->references--;
     } else {
-       debug(29, 1) ("authDigestNonceUnlink; Attempt to lower nonce %d refcount below 0!\n", nonce);
+       debug(29, 1) ("authDigestNonceUnlink; Attempt to lower nonce %p refcount below 0!\n", nonce);
     }
-    debug(29, 9) ("authDigestNonceUnlink: nonce '%d' now at '%d'.\n", nonce, nonce->references);
+    debug(29, 9) ("authDigestNonceUnlink: nonce '%p' now at '%d'.\n", nonce, nonce->references);
     if (nonce->references == 0)
        authenticateDigestNonceDelete(nonce);
 }
@@ -331,7 +331,7 @@ authenticateDigestNonceFindNonce(const char *nonceb64)
     nonce = hash_lookup(digest_nonce_cache, nonceb64);
     if ((nonce == NULL) || (strcmp(nonce->hash.key, nonceb64)))
        return NULL;
-    debug(29, 9) ("authDigestNonceFindNonce: Found nonce '%d'\n", nonce);
+    debug(29, 9) ("authDigestNonceFindNonce: Found nonce '%p'\n", nonce);
     return nonce;
 }
 
@@ -365,7 +365,7 @@ authDigestNonceIsStale(digest_nonce_h * nonce)
        return -1;
     /* has it's max duration expired? */
     if (nonce->noncedata.creationtime + digestConfig->noncemaxduration < current_time.tv_sec) {
-       debug(29, 4) ("authDigestNonceIsStale: Nonce is too old. %d %d %d\n", nonce->noncedata.creationtime, digestConfig->noncemaxduration, current_time.tv_sec);
+       debug(29, 4) ("authDigestNonceIsStale: Nonce is too old. %ld %d %ld\n", (long int)nonce->noncedata.creationtime, (int)digestConfig->noncemaxduration, (long int)current_time.tv_sec);
        nonce->flags.valid = 0;
        return -1;
     }
@@ -580,8 +580,8 @@ authDigestCfgDump(StoreEntry * entry, const char *name, authScheme * scheme)
        name, "digest", config->digestAuthRealm,
        name, "digest", config->authenticateChildren,
        name, "digest", config->noncemaxuses,
-       name, "digest", config->noncemaxduration,
-       name, "digest", config->nonceGCInterval);
+       name, "digest", (int)config->noncemaxduration,
+       name, "digest", (int)config->nonceGCInterval);
 }
 
 void
@@ -1296,7 +1296,7 @@ authenticateDigestDecodeAuth(auth_user_request_t * auth_user_request, const char
         */
        authDigestUserLinkNonce(auth_user, nonce);
     } else {
-       debug(29, 9) ("authDigestDecodeAuth: Found user '%s' in the user cache as '%d'\n", username, auth_user);
+       debug(29, 9) ("authDigestDecodeAuth: Found user '%s' in the user cache as '%p'\n", username, auth_user);
        digest_user = auth_user->scheme_data;
        xfree(username);
     }
@@ -1308,7 +1308,7 @@ authenticateDigestDecodeAuth(auth_user_request_t * auth_user_request, const char
     node = dlinkNodeNew();
     dlinkAdd(auth_user_request, node, &auth_user->requests);
 
-    debug(29, 9) ("username = '%s'\nrealm = '%s'\nqop = '%s'\nalgorithm = '%s'\nuri = '%s'\nnonce = '%s'\nnc = '%s'\ncnonce = '%s'\nresponse = '%s'\ndigestnonce = '%d'\n",
+    debug(29, 9) ("username = '%s'\nrealm = '%s'\nqop = '%s'\nalgorithm = '%s'\nuri = '%s'\nnonce = '%s'\nnc = '%s'\ncnonce = '%s'\nresponse = '%s'\ndigestnonce = '%p'\n",
        digest_user->username, digest_request->realm,
        digest_request->qop, digest_request->algorithm,
        digest_request->uri, digest_request->nonceb64,

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 8ff92cfe70c5e34f90029fda1855b93d5af4597b..8d0fbeff9b57f3d2c9d96f0b7860de8dab4fd84d 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.14 2001/10/17 17:09:08 hno Exp $
+ * $Id: auth_ntlm.cc,v 1.15 2001/10/24 05:26:16 hno Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins
@@ -151,7 +151,7 @@ authNTLMCfgDump(StoreEntry * entry, const char *name, authScheme * scheme)
     storeAppendPrintf(entry, "\n%s %s children %d\n%s %s max_challenge_reuses %d\n%s %s max_challenge_lifetime %d seconds\n",
        name, "ntlm", config->authenticateChildren,
        name, "ntlm", config->challengeuses,
-       name, "ntlm", config->challengelifetime);
+       name, "ntlm", (int)config->challengelifetime);
 
 }
 
@@ -285,7 +285,7 @@ authenticateNTLMDirection(auth_user_request_t * auth_user_request)
     switch (ntlm_request->auth_state) {
     case AUTHENTICATE_STATE_NONE:      /* no progress at all. */
        if (ntlm_request->flags.credentials_ok != 2)
-           debug(29, 1) ("authenticateNTLMDirection: called before NTLM Authenticate!. Report a bug to squid-dev. au %x\n", auth_user_request);
+           debug(29, 1) ("authenticateNTLMDirection: called before NTLM Authenticate!. Report a bug to squid-dev. au %p\n", auth_user_request);
        return -2;
     case AUTHENTICATE_STATE_NEGOTIATE:         /* send to helper */
     case AUTHENTICATE_STATE_RESPONSE:  /*send to helper */
@@ -355,7 +355,7 @@ authNTLMRequestFree(ntlm_request_t * ntlm_request)
     if (ntlm_request->ntlmauthenticate)
        xfree(ntlm_request->ntlmauthenticate);
     if (ntlm_request->authserver != NULL && ntlm_request->authserver_deferred) {
-       debug(29, 9) ("authenticateNTLMRequestFree: releasing server '%d'\n", ntlm_request->authserver);
+       debug(29, 9) ("authenticateNTLMRequestFree: releasing server '%p'\n", ntlm_request->authserver);
        helperStatefulReleaseServer(ntlm_request->authserver);
        ntlm_request->authserver = NULL;
     }
@@ -383,7 +383,7 @@ authenticateNTLMFreeUser(auth_user_t * auth_user)
     /* were they linked in by one or more proxy-authenticate headers */
     link = ntlm_user->proxy_auth_list.head;
     while (link) {
-       debug(29, 9) ("authenticateFreeProxyAuthUser: removing proxy_auth hash entry '%d'\n", link->data);
+       debug(29, 9) ("authenticateFreeProxyAuthUser: removing proxy_auth hash entry '%p'\n", link->data);
        proxy_auth_hash = link->data;
        tmplink = link;
        link = link->next;
@@ -432,10 +432,10 @@ authenticateNTLMHandleReply(void *data, void *lastserver, char *reply)
     auth_user_t *auth_user;
     ntlm_user_t *ntlm_user;
     ntlm_request_t *ntlm_request;
-    debug(29, 9) ("authenticateNTLMHandleReply: Helper: '%d' {%s}\n", lastserver, reply ? reply : "<NULL>");
+    debug(29, 9) ("authenticateNTLMHandleReply: Helper: '%p' {%s}\n", lastserver, reply ? reply : "<NULL>");
     valid = cbdataValid(r->data);
     if (!valid) {
-       debug(29, 1) ("AuthenticateNTLMHandleReply: invalid callback data. Releasing helper '%d'.\n", lastserver);
+       debug(29, 1) ("AuthenticateNTLMHandleReply: invalid callback data. Releasing helper '%p'.\n", lastserver);
        cbdataUnlock(r->data);
        authenticateStateFree(r);
        debug(29, 9) ("NTLM HandleReply, telling stateful helper : %d\n", S_HELPER_RELEASE);
@@ -466,7 +466,7 @@ authenticateNTLMHandleReply(void *data, void *lastserver, char *reply)
        result = S_HELPER_DEFER;
        /* reserve the server for future authentication */
        ntlm_request->authserver_deferred = 1;
-       debug(29, 9) ("authenticateNTLMHandleReply: helper '%d'\n", lastserver);
+       debug(29, 9) ("authenticateNTLMHandleReply: helper '%p'\n", lastserver);
        assert(ntlm_request->auth_state == AUTHENTICATE_STATE_NEGOTIATE);
        ntlm_request->authserver = lastserver;
        ntlm_request->authchallenge = xstrndup(reply, NTLM_CHALLENGE_SZ + 5);
@@ -565,7 +565,7 @@ authenticateNTLMHandleReply(void *data, void *lastserver, char *reply)
            /* The helper broke on YR. It automatically
             * resets */
            ntlm_request->flags.credentials_ok = 3;     /* cannot process */
-           debug(29, 1) ("authenticateNTLMHandleReply: Error obtaining challenge from helper: %d. Error returned '%s'\n", lastserver, reply);
+           debug(29, 1) ("authenticateNTLMHandleReply: Error obtaining challenge from helper: %p. Error returned '%s'\n", lastserver, reply);
            /* mark it for starving */
            helperstate->starve = 1;
            /* resubmit the request. This helper is currently busy, so we will get
@@ -646,7 +646,7 @@ authenticateNTLMChangeChallenge_p(ntlm_helper_state_t * helperstate)
        return 1;
     }
     if (helperstate->renewed + ntlmConfig->challengelifetime < squid_curtime) {
-       debug(29, 4) ("authenticateNTLMChangeChallenge_p: Challenge exceeded max lifetime by %d seconds\n", squid_curtime - (helperstate->renewed + ntlmConfig->challengelifetime));
+       debug(29, 4) ("authenticateNTLMChangeChallenge_p: Challenge exceeded max lifetime by %d seconds\n", (int) (squid_curtime - (helperstate->renewed + ntlmConfig->challengelifetime)));
        return 1;
     }
     debug(29, 9) ("Challenge is to be reused\n");
@@ -683,7 +683,7 @@ authenticateNTLMStart(auth_user_request_t * auth_user_request, RH * handler, voi
     case AUTHENTICATE_STATE_RESPONSE:
        sent_string = xstrdup(ntlm_request->ntlmauthenticate);
        assert(ntlm_request->authserver);
-       debug(29, 9) ("authenticateNTLMStart: Asking NTLMauthenticator '%d'.\n", ntlm_request->authserver);
+       debug(29, 9) ("authenticateNTLMStart: Asking NTLMauthenticator '%p'.\n", ntlm_request->authserver);
        break;
     default:
        fatal("Invalid authenticate state for NTLMStart");
@@ -727,7 +727,7 @@ authenticateNTLMStart(auth_user_request_t * auth_user_request, RH * handler, voi
 
        ntlm_request->authserver = server;
        /* tell the log what helper we have been given */
-       debug(29, 9) ("authenticateNTLMStart: helper '%d' assigned\n", server);
+       debug(29, 9) ("authenticateNTLMStart: helper '%p' assigned\n", server);
        /* server and valid challenge? */
        if ((server == NULL) || !authenticateNTLMValidChallenge(helperstate)) {
            /* No server, or server with invalid challenge */
@@ -819,7 +819,7 @@ authenticateNTLMReleaseServer(auth_user_request_t * auth_user_request)
     assert(auth_user_request->auth_user->auth_type == AUTH_NTLM);
     assert(auth_user_request->scheme_data != NULL);
     ntlm_request = auth_user_request->scheme_data;
-    debug(29, 9) ("authenticateNTLMReleaseServer: releasing server '%d'\n", ntlm_request->authserver);
+    debug(29, 9) ("authenticateNTLMReleaseServer: releasing server '%p'\n", ntlm_request->authserver);
     helperStatefulReleaseServer(ntlm_request->authserver);
     ntlm_request->authserver = NULL;
 }

diff --git a/src/fs/aufs/aiops.cc b/src/fs/aufs/aiops.cc
index 0253719c2c5706c58f3af255b55f9cfbded91cc2..c61e9ed2894a924874878375b3bdb7928f9f8cce 100644 (file)
--- a/src/fs/aufs/aiops.cc
+++ b/src/fs/aufs/aiops.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: aiops.cc,v 1.11 2001/10/17 19:33:06 hno Exp $
+ * $Id: aiops.cc,v 1.12 2001/10/24 05:26:18 hno Exp $
  *
  * DEBUG: section 43    AIOPS
  * AUTHOR: Stewart Forster <slf@connect.com.au>
@@ -475,8 +475,8 @@ squidaio_queue_request(squidaio_request_t * request)
            squid_curtime >= (high_start + 5)) {
            debug(43, 1) ("squidaio_queue_request: WARNING - Disk I/O overloading\n");
            if (squid_curtime >= (high_start + 15))
-               debug(43, 1) ("squidaio_queue_request: Queue Length: current=%d, high=%d, low=%d, duration=%d\n",
-                   request_queue_len, queue_high, queue_low, squid_curtime - high_start);
+               debug(43, 1) ("squidaio_queue_request: Queue Length: current=%d, high=%d, low=%d, duration=%ld\n",
+                   request_queue_len, queue_high, queue_low, (long int) (squid_curtime - high_start));
            last_warn = squid_curtime;
        }
     } else {

diff --git a/src/fs/coss/store_io_coss.cc b/src/fs/coss/store_io_coss.cc
index 715eb9cc7c3a3fe28ab2e66a381dcc46ff51dc83..0675aeebf8085ed74038e8de38eb8f761ca31b09 100644 (file)
--- a/src/fs/coss/store_io_coss.cc
+++ b/src/fs/coss/store_io_coss.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_coss.cc,v 1.11 2001/08/12 10:20:41 adrian Exp $
+ * $Id: store_io_coss.cc,v 1.12 2001/10/24 05:26:22 hno Exp $
  *
  * DEBUG: section 81    Storage Manager COSS Interface
  * AUTHOR: Eric Stern
@@ -282,7 +282,7 @@ storeCossRead(SwapDir * SD, storeIOState * sio, char *buf, size_t size, off_t of
     assert(sio->read.callback_data == NULL);
     sio->read.callback = callback;
     sio->read.callback_data = callback_data;
-    debug(81, 3) ("storeCossRead: offset %d\n", offset);
+    debug(81, 3) ("storeCossRead: offset %ld\n", (long int)offset);
     sio->offset = offset;
     cstate->flags.reading = 1;
     if ((offset + size) > sio->st_size)
@@ -322,7 +322,7 @@ storeCossWrite(SwapDir * SD, storeIOState * sio, char *buf, size_t size, off_t o
      */
     assert(sio->e->mem_obj->object_sz != -1);
 
-    debug(81, 3) ("storeCossWrite: offset %d, len %d\n", sio->offset, size);
+    debug(81, 3) ("storeCossWrite: offset %ld, len %lu\n", (long int)sio->offset, (unsigned long int)size);
     diskoffset = sio->swap_filen + sio->offset;
     dest = storeCossMemPointerFromDiskOffset(SD, diskoffset, &membuf);
     assert(dest != NULL);
@@ -416,12 +416,12 @@ storeCossMemBufLock(SwapDir * SD, storeIOState * e)
     for (m = cs->membufs.head; m; m = m->next) {
        t = m->data;
        if ((e->swap_filen >= t->diskstart) && (e->swap_filen <= t->diskend)) {
-           debug(81, 3) ("storeCossMemBufLock: locking %08X, lockcount %d\n", t, t->lockcount);
+           debug(81, 3) ("storeCossMemBufLock: locking %p, lockcount %d\n", t, t->lockcount);
            t->lockcount++;
            return;
        }
     }
-    debug(81, 3) ("storeCossMemBufLock: FAILED to lock %08X\n", e);
+    debug(81, 3) ("storeCossMemBufLock: FAILED to lock %p\n", e);
 }
 
 static void
@@ -441,7 +441,7 @@ storeCossMemBufUnlock(SwapDir * SD, storeIOState * e)
        t = m->data;
        if ((e->swap_filen >= t->diskstart) && (e->swap_filen <= t->diskend)) {
            t->lockcount--;
-           debug(81, 3) ("storeCossMemBufUnlock: unlocking %08X, lockcount %d\n", t, t->lockcount);
+           debug(81, 3) ("storeCossMemBufUnlock: unlocking %p, lockcount %d\n", t, t->lockcount);
        }
        if (t->flags.full && !t->flags.writing && !t->lockcount)
            storeCossWriteMemBuf(SD, t);
@@ -491,7 +491,7 @@ storeCossWriteMemBufDone(int fd, int errflag, size_t len, void *my_data)
     CossMemBuf *t = my_data;
     CossInfo *cs = (CossInfo *) t->SD->fsdata;
 
-    debug(81, 3) ("storeCossWriteMemBufDone: buf %08X, len %d\n", t, len);
+    debug(81, 3) ("storeCossWriteMemBufDone: buf %p, len %ld\n", t, (long int)len);
     if (errflag)
        debug(81, 0) ("storeCossMemBufWriteDone: got failure (%d)\n", errflag);
 
@@ -513,7 +513,7 @@ storeCossCreateMemBuf(SwapDir * SD, size_t start,
     newmb = cbdataAlloc(CossMemBuf);
     newmb->diskstart = start;
     debug(81, 3) ("storeCossCreateMemBuf: creating new membuf at %d\n", newmb->diskstart);
-    debug(81, 3) ("storeCossCreateMemBuf: at %08X\n", newmb);
+    debug(81, 3) ("storeCossCreateMemBuf: at %p\n", newmb);
     newmb->diskend = newmb->diskstart + COSS_MEMBUF_SZ - 1;
     newmb->flags.full = 0;
     newmb->flags.writing = 0;

diff --git a/src/repl/heap/store_heap_replacement.cc b/src/repl/heap/store_heap_replacement.cc
index 7f5aa7494fa7d6be4e171beedc1c39fe6dd5127e..f99820ad019e2c59fb71bf2249dccfd2952361e6 100644 (file)
--- a/src/repl/heap/store_heap_replacement.cc
+++ b/src/repl/heap/store_heap_replacement.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_heap_replacement.cc,v 1.6 2001/02/07 18:56:56 hno Exp $
+ * $Id: store_heap_replacement.cc,v 1.7 2001/10/24 05:26:22 hno Exp $
  *
  * DEBUG: section 20    Storage Manager Heap-based replacement
  * AUTHOR: John Dilley
@@ -78,8 +78,8 @@ HeapKeyGen_StoreEntry_LFUDA(void *entry, double age)
     else
        tie = 1.0 - exp((double) (e->lastref - squid_curtime) / 86400.0);
     key = age + (double) e->refcount - tie;
-    debug(81, 3) ("HeapKeyGen_StoreEntry_LFUDA: %s refcnt=%ld lastref=%ld age=%f tie=%f -> %f\n",
-       storeKeyText(e->hash.key), e->refcount, e->lastref, age, tie, key);
+    debug(81, 3) ("HeapKeyGen_StoreEntry_LFUDA: %s refcnt=%d lastref=%ld age=%f tie=%f -> %f\n",
+       storeKeyText(e->hash.key), (int)e->refcount, e->lastref, age, tie, key);
     if (e->mem_obj && e->mem_obj->url)
        debug(81, 3) ("HeapKeyGen_StoreEntry_LFUDA: url=%s\n",
            e->mem_obj->url);
@@ -114,8 +114,8 @@ HeapKeyGen_StoreEntry_GDSF(void *entry, double age)
     double size = e->swap_file_sz ? (double) e->swap_file_sz : 1.0;
     double tie = (e->lastref > 1) ? (1.0 / e->lastref) : 1.0;
     key = age + ((double) e->refcount / size) - tie;
-    debug(81, 3) ("HeapKeyGen_StoreEntry_GDSF: %s size=%f refcnt=%ld lastref=%ld age=%f tie=%f -> %f\n",
-       storeKeyText(e->hash.key), size, e->refcount, e->lastref, age, tie, key);
+    debug(81, 3) ("HeapKeyGen_StoreEntry_GDSF: %s size=%f refcnt=%d lastref=%ld age=%f tie=%f -> %f\n",
+       storeKeyText(e->hash.key), size, (int)e->refcount, e->lastref, age, tie, key);
     if (e->mem_obj && e->mem_obj->url)
        debug(81, 3) ("HeapKeyGen_StoreEntry_GDSF: url=%s\n",
            e->mem_obj->url);