printf errors/warnings

diff --git a/src/acl.cc b/src/acl.cc
index ed84fc77b90f2343fc529bd8334c007ba42583ee..f52172962bcc7e8d74ba1482381a9a6f7b9ea125 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.153 1998/03/27 04:44:54 wessels Exp $
+ * $Id: acl.cc,v 1.154 1998/03/28 23:24:40 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -1630,7 +1630,6 @@ aclChecklistCreate(const acl_access * A,
        xstrncpy(checklist->browser, user_agent, BROWSERNAMELEN);
     if (ident)
        xstrncpy(checklist->ident, ident, ICP_IDENT_SZ);
-    debug(28, 6) ("aclChecklistCreate: %x\n", checklist);
     return checklist;
 }
 
@@ -1640,7 +1639,6 @@ aclNBCheck(aclCheck_t * checklist, PF callback, void *callback_data)
     checklist->callback = callback;
     checklist->callback_data = callback_data;
     cbdataLock(callback_data);
-    debug(28, 5) ("aclNBCheck: calling aclCheck with %x\n", checklist);
     aclCheck(checklist);
 }
 
@@ -1926,7 +1924,7 @@ aclReadProxyAuth(acl_proxy_auth * p)
                xfree(passwords);
            } else {
                debug(28, 5) ("aclReadProxyAuth: %s not changed (old=%d,new=%d)\n",
-                   p->filename, p->change_time, buf.st_mtime);
+                   p->filename, (int) p->change_time, (int) buf.st_mtime);
            }
        } else {
            debug(28, 0) ("aclReadProxyAuth: can't access proxy_auth file %s, turning authentication off\n", p->filename);

diff --git a/src/asn.cc b/src/asn.cc
index face8dd2883182e6749d1557b2ade28655101013..00483c498cbe7839a6ed753d59e507084a4fe63d 100644 (file)
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: asn.cc,v 1.28 1998/03/27 22:44:18 wessels Exp $
+ * $Id: asn.cc,v 1.29 1998/03/28 23:24:41 wessels Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -281,7 +281,7 @@ asnAddNet(char *as_string, int as_number)
     xstrncpy(dbg2, inet_ntoa(in_m), 32);
     addr = ntohl(addr);
     mask = ntohl(mask);
-    debug(53, 3) ("asnAddNet: called for %s/%s (%x/%x)\n", dbg1, dbg2, addr, mask);
+    debug(53, 3) ("asnAddNet: called for %s/%s\n", dbg1, dbg2);
     memset(e, '\0', sizeof(rtentry));
     store_m_int(addr, e->e_addr);
     store_m_int(mask, e->e_mask);

diff --git a/src/client.cc b/src/client.cc
index 7661d021ce788a8926a7c9880b73891ec11a38e8..582dcc10bbf1364d5d770100d52cf4b38a1fecef 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -3,7 +3,7 @@
 
 
 /*
- * $Id: client.cc,v 1.60 1998/03/07 05:49:35 wessels Exp $
+ * $Id: client.cc,v 1.61 1998/03/28 23:24:42 wessels Exp $
  *
  * DEBUG: section 0     WWW Client
  * AUTHOR: Harvest Derived
@@ -270,7 +270,7 @@ main(int argc, char *argv[])
        strcat(msg, buf);
     }
     if (put_fd > 0) {
-       snprintf(buf, BUFSIZ, "Content-length: %d\r\n", sb.st_size);
+       snprintf(buf, BUFSIZ, "Content-length: %d\r\n", (int) sb.st_size);
        strcat(msg, buf);
     }
     if (opt_noaccept == 0) {

diff --git a/src/client_side.cc b/src/client_side.cc
index 2a4eaa514c7c0c226e9e9fe5d40f517ad9bcd65d..04f4bbe4f69c5acb4e5e033a744e6d74bf20f709 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.237 1998/03/28 20:33:45 wessels Exp $
+ * $Id: client_side.cc,v 1.238 1998/03/28 23:24:43 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -240,7 +240,7 @@ clientProcessExpired(void *data)
     storeClientListAdd(http->old_entry, http);
     entry->lastmod = http->old_entry->lastmod;
     debug(33, 5) ("clientProcessExpired: setting lmt = %d\n",
-       entry->lastmod);
+       (int) entry->lastmod);
     entry->refcount++;         /* EXPIRED CASE */
     http->entry = entry;
     http->out.offset = 0;
@@ -276,7 +276,8 @@ clientGetsOldEntry(StoreEntry * new_entry, StoreEntry * old_entry, request_t * r
     /* If the client IMS time is prior to the entry LASTMOD time we
      * need to send the old object */
     if (modifiedSince(old_entry, request)) {
-       debug(33, 5) ("clientGetsOldEntry: YES, modified since %d\n", request->ims);
+       debug(33, 5) ("clientGetsOldEntry: YES, modified since %d\n",
+               (int) request->ims);
        return 1;
     }
     debug(33, 5) ("clientGetsOldEntry: NO, new one is fine\n");
@@ -925,7 +926,7 @@ clientSendMoreData(void *data, char *buf, ssize_t size)
     assert(size <= SM_PAGE_SIZE);
     assert(http->request != NULL);
     debug(33, 5) ("clientSendMoreData: FD %d '%s', out.offset=%d \n",
-       fd, storeUrl(entry), http->out.offset);
+       fd, storeUrl(entry), (int) http->out.offset);
     if (conn->chr != http) {
        /* there is another object in progress, defer this one */
        debug(0, 0) ("clientSendMoreData: Deferring %s\n", storeUrl(entry));
@@ -1032,7 +1033,7 @@ clientWriteComplete(int fd, char *bufnotused, size_t size, int errflag, void *da
     int done;
     http->out.size += size;
     debug(33, 5) ("clientWriteComplete: FD %d, sz %d, err %d, off %d, len %d\n",
-       fd, size, errflag, http->out.offset, objectLen(entry));
+       fd, size, errflag, (int) http->out.offset, objectLen(entry));
     if (errflag) {
 #if DONT_DO_THIS
        /*
@@ -1716,7 +1717,7 @@ clientReadRequest(int fd, void *data)
            comm_close(fd);
            return;
        } else if (conn->in.offset == 0) {
-           debug(50, 2) ("clientReadRequest: FD %d: no data to process\n");
+           debug(50, 2) ("clientReadRequest: FD %d: no data to process\n", fd);
            return;
        }
        /* Continue to process previously read data */
@@ -1828,7 +1829,7 @@ clientReadRequest(int fd, void *data)
                    debug(33, 0) ("Config 'request_size'= %d bytes.\n",
                        Config.maxRequestSize);
                    debug(33, 0) ("This request = %d bytes.\n",
-                       conn->in.offset);
+                       (int) conn->in.offset);
                    err = errorCon(ERR_INVALID_REQ, HTTP_REQUEST_ENTITY_TOO_LARGE);
                    http->entry = clientCreateStoreEntry(http, request->method, 0);
                    errorAppendEntry(http->entry, err);
@@ -1839,7 +1840,7 @@ clientReadRequest(int fd, void *data)
                conn->in.buf = xrealloc(conn->in.buf, conn->in.size);
                /* XXX account conn->in.buf */
                debug(33, 2) ("Handling a large request, offset=%d inbufsize=%d\n",
-                   conn->in.offset, conn->in.size);
+                   (int) conn->in.offset, conn->in.size);
                k = conn->in.size - 1 - conn->in.offset;
            }
            break;

diff --git a/src/comm.cc b/src/comm.cc
index 9e0313011e8d1f985472729f9b35c504631ee12a..6bc65d93d22636e5e4a1a9692074113c703ae57d 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.238 1998/03/27 19:42:22 wessels Exp $
+ * $Id: comm.cc,v 1.239 1998/03/28 23:24:44 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -200,8 +200,8 @@ comm_local_port(int fd)
        debug(50, 1) ("comm_local_port: Failed to retrieve TCP/UDP port number for socket: FD %d: %s\n", fd, xstrerror());
        return 0;
     }
-    debug(5, 6) ("comm_local_port: FD %d: sockaddr %u.\n", fd, addr.sin_addr.s_addr);
     F->local_port = ntohs(addr.sin_port);
+    debug(5, 6) ("comm_local_port: FD %d: port %d\n", fd, (int) F->local_port);
     return F->local_port;
 }
 
@@ -1133,7 +1133,7 @@ comm_select(time_t sec)
        }
        return COMM_OK;
     } while (timeout > squid_curtime);
-    debug(5, 8) ("comm_select: time out: %d.\n", squid_curtime);
+    debug(5, 8) ("comm_select: time out: %d\n", (int) squid_curtime);
     return COMM_TIMEOUT;
 }
 #endif
@@ -1377,7 +1377,7 @@ commHandleWrite(int fd, void *data)
     int nleft;
 
     debug(5, 5) ("commHandleWrite: FD %d: off %d, sz %d.\n",
-       fd, state->offset, state->size);
+       fd, (int) state->offset, state->size);
 
     nleft = state->size - state->offset;
     len = write(fd, state->buf + state->offset, nleft);

diff --git a/src/disk.cc b/src/disk.cc
index 0b132af249440fa8f9a03b7458ced67c88c5ac95..4520c3e09262dca00bf1e23cda56b1f5cc31f08f 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: disk.cc,v 1.112 1998/03/27 03:23:05 wessels Exp $
+ * $Id: disk.cc,v 1.113 1998/03/28 23:24:45 wessels Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -279,7 +279,7 @@ diskHandleWrite(int fd, void *notused)
        ctrlp);
 #else
     debug(6, 3) ("diskHandleWrite: FD %d writing %d bytes\n",
-       fd, fdd->write_q->len - fdd->write_q->buf_offset);
+       fd, (int) (fdd->write_q->len - fdd->write_q->buf_offset));
     len = write(fd,
        fdd->write_q->buf + fdd->write_q->buf_offset,
        fdd->write_q->len - fdd->write_q->buf_offset);
@@ -375,7 +375,7 @@ diskHandleWriteComplete(void *data, int len, int errcode)
        q->buf_offset += len;
        if (q->buf_offset > q->len)
            debug(50, 1) ("diskHandleWriteComplete: q->buf_offset > q->len (%p,%d, %d, %d FD %d)\n",
-               q, q->buf_offset, q->len, len, fd);
+               q, (int) q->buf_offset, q->len, len, fd);
        assert(q->buf_offset <= q->len);
        if (q->buf_offset == q->len) {
            /* complete write */

diff --git a/src/dns.cc b/src/dns.cc
index 5cd066581f8c5ce2ac75b6425c210d3cce528828..767e177b53c077cd99c75350631d5894fc1e08db 100644 (file)
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns.cc,v 1.56 1998/02/19 23:09:50 wessels Exp $
+ * $Id: dns.cc,v 1.57 1998/03/28 23:24:46 wessels Exp $
  *
  * DEBUG: section 34    Dnsserver interface
  * AUTHOR: Harvest Derived
@@ -257,7 +257,7 @@ dnsStats(StoreEntry * sentry)
        storeAppendPrintf(sentry, "    Read Buffer Size: %d bytes\n",
            dns->size);
        storeAppendPrintf(sentry, "    Read Offset: %d bytes\n",
-           dns->offset);
+           (int) dns->offset);
     }
     storeAppendPrintf(sentry, "\nFlags key:\n\n");
     storeAppendPrintf(sentry, "   A = ALIVE\n");

diff --git a/src/event.cc b/src/event.cc
index 1bb98b0d551cba183770877060cb58156bb77d2e..ae529b37fc00a2eb5bd6603e9e4d9975d877323f 100644 (file)
--- a/src/event.cc
+++ b/src/event.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: event.cc,v 1.10 1998/03/23 22:37:10 wessels Exp $
+ * $Id: event.cc,v 1.11 1998/03/28 23:24:46 wessels Exp $
  *
  * DEBUG: section 41    Event Processing
  * AUTHOR: Henrik Nordstrom
@@ -52,7 +52,7 @@ eventAdd(const char *name, EVH * func, void *arg, time_t when)
     event->arg = arg;
     event->name = name;
     event->when = squid_curtime + when;
-    debug(41, 7) ("eventAdd: Adding '%s', in %d seconds\n", name, when);
+    debug(41, 7) ("eventAdd: Adding '%s', in %d seconds\n", name, (int) when);
     /* Insert after the last event with the same or earlier time */
     for (E = &tasks; *E; E = &(*E)->next) {
        if ((*E)->when > event->when)
@@ -124,7 +124,7 @@ eventDump(StoreEntry * sentry)
        "Next Execution");
     while (e != NULL) {
        storeAppendPrintf(sentry, "%s\t%d seconds\n",
-           e->name, e->when - squid_curtime);
+           e->name, (int) (e->when - squid_curtime));
        e = e->next;
     }
 }

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index c6a87720b9535c6177953c5088595d9c586862fc..0a3656d856660dc8b9955a0544eb612668e882a4 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.93 1998/03/24 17:29:45 wessels Exp $
+ * $Id: fqdncache.cc,v 1.94 1998/03/28 23:24:47 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -551,7 +551,8 @@ fqdncache_nbgethostbyaddr(struct in_addr addr, FQDNH * handler, void *handlerDat
        FqdncacheStats.pending_hits++;
        fqdncacheAddPending(f, handler, handlerData);
        if (squid_curtime - f->expires > 600) {
-           debug(14, 0) ("fqdncache_nbgethostbyname: '%s' PENDING for %d seconds, aborting\n", name, squid_curtime + Config.negativeDnsTtl - f->expires);
+           debug(14, 0) ("fqdncache_nbgethostbyname: '%s' PENDING for %d seconds, aborting\n", name,
+               (int) (squid_curtime + Config.negativeDnsTtl - f->expires));
            fqdncacheChangeKey(f);
            fqdncache_call_pending(f);
        }
@@ -641,7 +642,7 @@ fqdncacheUnregister(struct in_addr addr, void *data)
     fqdncache_entry *f = NULL;
     fqdn_pending *p = NULL;
     int n = 0;
-    debug(35, 3) ("fqdncacheUnregister: FD %d, name '%s'\n", name);
+    debug(35, 3) ("fqdncacheUnregister: FD %d, name '%s'\n", fd, name);
     if ((f = fqdncache_get(name)) == NULL)
        return 0;
     if (f->status == FQDN_PENDING || f->status == FQDN_DISPATCHED) {

diff --git a/src/ipcache.cc b/src/ipcache.cc
index ccaa283ed7a1df8625c6d2ae1ecafff27c71afbe..acf59bf3e321a64f1e3211a416670d48ac06a4bb 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.171 1998/03/24 17:29:46 wessels Exp $
+ * $Id: ipcache.cc,v 1.172 1998/03/28 23:24:48 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -605,7 +605,7 @@ ipcache_nbgethostbyname(const char *name, IPH * handler, void *handlerData)
        IpcacheStats.pending_hits++;
        ipcacheAddPending(i, handler, handlerData);
        if (squid_curtime - i->expires > 600) {
-           debug(14, 0) ("ipcache_nbgethostbyname: '%s' PENDING for %d seconds, aborting\n", name, squid_curtime + Config.negativeDnsTtl - i->expires);
+           debug(14, 0) ("ipcache_nbgethostbyname: '%s' PENDING for %d seconds, aborting\n", name, (int) (squid_curtime + Config.negativeDnsTtl - i->expires));
            ipcacheChangeKey(i);
            ipcache_call_pending(i);
        }

diff --git a/src/main.cc b/src/main.cc
index 7f1dfee48044f260ddce55c56cc3b94a57793985..ba8eab1e203e9ffc7bc5ca89d046bdc2cf25e90d 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.238 1998/03/23 22:37:11 wessels Exp $
+ * $Id: main.cc,v 1.239 1998/03/28 23:24:48 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -315,7 +315,7 @@ shut_down(int sig)
     debug(1, 1) ("Preparing for shutdown after %d requests\n",
        Counter.client_http.requests);
     debug(1, 1) ("Waiting %d seconds for active connections to finish\n",
-       shutdown_pending > 0 ? Config.shutdownLifetime : 0);
+       shutdown_pending > 0 ? (int) Config.shutdownLifetime : 0);
 #ifdef KILL_PARENT_OPT
     {
        pid_t ppid = getppid();

diff --git a/src/stat.cc b/src/stat.cc
index 43553e7ef46abcd0016a6578c7e13756bcbd0313..24377f41d4bc85b7129809dbb8cc2ebdab4e2d14 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.219 1998/03/25 05:50:41 wessels Exp $
+ * $Id: stat.cc,v 1.220 1998/03/28 23:24:49 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -340,8 +340,8 @@ statObjects(StoreEntry * sentry, int vm_or_not)
        storeAppendPrintf(sentry, "\tinmem_lo: %d\n", (int) mem->inmem_lo);
        storeAppendPrintf(sentry, "\tinmem_hi: %d\n", (int) mem->inmem_hi);
        storeAppendPrintf(sentry, "\tswapout: %d bytes done, %d queued, FD %d\n",
-           mem->swapout.done_offset,
-           mem->swapout.queue_offset,
+           (int) mem->swapout.done_offset,
+           (int) mem->swapout.queue_offset,
            mem->swapout.fd);
        for (i = 0; i < mem->nclients; i++) {
            sc = &mem->clients[i];
@@ -415,7 +415,7 @@ statFiledescriptors(StoreEntry * sentry)
        storeAppendPrintf(sentry, "%4d %-6.6s %4d %7d %7d %-21s %s\n",
            i,
            fdTypeStr[f->type],
-           f->timeout_handler ? (f->timeout - squid_curtime) / 60 : 0,
+           f->timeout_handler ? (int) (f->timeout - squid_curtime) / 60 : 0,
            f->bytes_read,
            f->bytes_written,
            fdRemoteAddr(f),
@@ -470,7 +470,7 @@ info_get(StoreEntry * sentry)
     storeAppendPrintf(sentry, "\tStorage Swap size:\t%d KB\n",
        store_swap_size);
     storeAppendPrintf(sentry, "\tStorage Mem size:\t%d KB\n",
-       store_mem_size >> 10);
+       (int) (store_mem_size >> 10));
     storeAppendPrintf(sentry, "\tStorage LRU Expiration Age:\t%6.2f days\n",
        (double) storeExpiredReferenceAge() / 86400.0);
     storeAppendPrintf(sentry, "\tRequests given to unlinkd:\t%d\n",
@@ -483,9 +483,9 @@ info_get(StoreEntry * sentry)
     storeAppendPrintf(sentry, "\tCPU Time:\t%.3f seconds\n", cputime);
     storeAppendPrintf(sentry, "\tCPU Usage:\t%.2f%%\n",
        dpercent(cputime, runtime));
-    storeAppendPrintf(sentry, "\tMaximum Resident Size: %ld KB\n",
+    storeAppendPrintf(sentry, "\tMaximum Resident Size: %d KB\n",
        rusage_maxrss(&rusage));
-    storeAppendPrintf(sentry, "\tPage faults with physical i/o: %ld\n",
+    storeAppendPrintf(sentry, "\tPage faults with physical i/o: %d\n",
        rusage_pagefaults(&rusage));
 
 #if HAVE_MSTATS && HAVE_GNUMALLOC_H
@@ -592,12 +592,12 @@ statAvgDump(StoreEntry * sentry, int minutes, int hours)
     ct = f->cputime - l->cputime;
 
     storeAppendPrintf(sentry, "sample_start_time = %d.%d (%s)\n",
-       f->timestamp.tv_sec,
-       f->timestamp.tv_usec,
+       (int) f->timestamp.tv_sec,
+       (int) f->timestamp.tv_usec,
        mkrfc1123(f->timestamp.tv_sec));
     storeAppendPrintf(sentry, "sample_end_time = %d.%d (%s)\n",
-       l->timestamp.tv_sec,
-       l->timestamp.tv_usec,
+       (int) l->timestamp.tv_sec,
+       (int) l->timestamp.tv_usec,
        mkrfc1123(l->timestamp.tv_sec));
 
     storeAppendPrintf(sentry, "client_http.requests = %f/sec\n",
@@ -843,8 +843,8 @@ statCountersDump(StoreEntry * sentry)
     f->cputime = rusage_cputime(&rusage);
 
     storeAppendPrintf(sentry, "sample_time = %d.%d (%s)\n",
-       f->timestamp.tv_sec,
-       f->timestamp.tv_usec,
+       (int) f->timestamp.tv_sec,
+       (int) f->timestamp.tv_usec,
        mkrfc1123(f->timestamp.tv_sec));
     storeAppendPrintf(sentry, "client_http.requests = %d\n",
        f->client_http.requests);

diff --git a/src/stmem.cc b/src/stmem.cc
index 7c0495f44534352f860ac66d056c4720e7b78979..a7081a9c0ae6140cad6039233985afdddb84f73e 100644 (file)
--- a/src/stmem.cc
+++ b/src/stmem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stmem.cc,v 1.59 1998/03/03 00:31:13 rousskov Exp $
+ * $Id: stmem.cc,v 1.60 1998/03/28 23:24:50 wessels Exp $
  *
  * DEBUG: section 19    Store Memory Primitives
  * AUTHOR: Harvest Derived
@@ -213,7 +213,7 @@ stmemCopy(const mem_hdr * mem, off_t offset, char *buf, size_t size)
     char *ptr_to_buf = NULL;
     int bytes_from_this_packet = 0;
     int bytes_into_this_packet = 0;
-    debug(19, 6) ("memCopy: offset %d: size %d\n", offset, size);
+    debug(19, 6) ("memCopy: offset %d: size %d\n", (int) offset, size);
     if (p == NULL)
        return 0;
     assert(size > 0);

diff --git a/src/store.cc b/src/store.cc
index 375dade411920faf21bc49523775f83f3ac24a44..9bcd30f5d5e7fe742d31c0e0ac68cdb9990cb360 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.397 1998/03/27 04:45:21 wessels Exp $
+ * $Id: store.cc,v 1.398 1998/03/28 23:24:51 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -235,7 +235,7 @@ static void
 destroy_MemObjectData(MemObject * mem)
 {
     debug(20, 3) ("destroy_MemObjectData: destroying %p, %d bytes\n",
-       mem->data, mem->inmem_hi);
+       mem->data, (int) mem->inmem_hi);
     if (mem->data) {
        stmemFree(mem->data);
        mem->data = NULL;
@@ -1006,12 +1006,12 @@ storeMemObjectDump(MemObject * mem)
     debug(20, 1) ("MemObject->data: %p\n",
        mem->data);
     debug(20, 1) ("MemObject->start_ping: %d.%06d\n",
-       mem->start_ping.tv_sec,
-       mem->start_ping.tv_usec);
+       (int) mem->start_ping.tv_sec,
+       (int) mem->start_ping.tv_usec);
     debug(20, 1) ("MemObject->inmem_hi: %d\n",
-       mem->inmem_hi);
+       (int) mem->inmem_hi);
     debug(20, 1) ("MemObject->inmem_lo: %d\n",
-       mem->inmem_lo);
+       (int) mem->inmem_lo);
     debug(20, 1) ("MemObject->clients: %p\n",
        mem->clients);
     debug(20, 1) ("MemObject->nclients: %d\n",

diff --git a/src/store_dir.cc b/src/store_dir.cc
index e5551e65d90c4bcb531cd894a0e70908b422ce36..06635db00dd78b62da4eb0b951a3c25bd9a0a9f1 100644 (file)
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir.cc,v 1.56 1998/02/13 18:16:06 wessels Exp $
+ * $Id: store_dir.cc,v 1.57 1998/03/28 23:24:52 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -656,8 +656,9 @@ storeDirWriteCleanLogs(int reopen)
     stop = squid_curtime;
     r = stop - start;
     debug(20, 1) ("  Finished.  Wrote %d entries.\n", n);
-    debug(20, 1) ("  Took %d seconds (%6.1lf entries/sec).\n",
-       r > 0 ? r : 0, (double) n / (r > 0 ? r : 1));
+    debug(20, 1) ("  Took %d seconds (%6.1f entries/sec).\n",
+       r > 0 ? (int) r : 0,
+       (double) n / (r > 0 ? r : 1));
     /* touch a timestamp file if we're not still validating */
     if (!store_rebuilding) {
        for (dirn = 0; dirn < Config.cacheSwap.n_configured; dirn++) {

diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc
index 228fd76a9e838799f03ab2ce2c652ac696382cdc..ce673733bc061536ef75470d59fb65ae15eddf72 100644 (file)
--- a/src/store_rebuild.cc
+++ b/src/store_rebuild.cc
@@ -167,7 +167,7 @@ storeRebuildFromDirectory(rebuild_dir * d)
            tmpe.swap_file_sz = sb.st_size;
        } else if (tmpe.swap_file_sz != sb.st_size) {
            debug(20, 1) ("storeRebuildFromDirectory: SIZE MISMATCH %d!=%d\n",
-               tmpe.swap_file_sz, sb.st_size);
+               tmpe.swap_file_sz, (int) sb.st_size);
            storeUnlinkFileno(sfileno);
            continue;
        }
@@ -586,7 +586,7 @@ storeCleanup(void *datanotused)
                debug(0, 0) ("storeCleanup: PATH %s\n",
                    storeSwapFullPath(e->swap_file_number, NULL));
                debug(0, 0) ("storeCleanup: ENTRY SIZE: %d, FILE SIZE: %d\n",
-                   e->swap_file_sz, sb.st_size);
+                   e->swap_file_sz, (int) sb.st_size);
                storeEntryDump(e, 0);
                continue;
            }
@@ -687,8 +687,9 @@ storeRebuildComplete(void)
     debug(20, 1) ("  %7d Objects cancelled.\n", RebuildState.cancelcount);
     debug(20, 1) ("  %7d Duplicate URLs purged.\n", RebuildState.dupcount);
     debug(20, 1) ("  %7d Swapfile clashes avoided.\n", RebuildState.clashcount);
-    debug(20, 1) ("  Took %d seconds (%6.1lf objects/sec).\n",
-       r > 0 ? r : 0, (double) RebuildState.objcount / (r > 0 ? r : 1));
+    debug(20, 1) ("  Took %d seconds (%6.1f objects/sec).\n",
+       r > 0 ? (int) r : 0,
+       (double) RebuildState.objcount / (r > 0 ? r : 1));
     debug(20, 1) ("Beginning Validation Procedure\n");
     eventAdd("storeCleanup", storeCleanup, NULL, 0);
 }

diff --git a/src/store_swapin.cc b/src/store_swapin.cc
index 783ac7b7b916e33111d0815a7177b8e548077c77..721e418e519fdb62a8b6b66d8b4d46271e1259a2 100644 (file)
--- a/src/store_swapin.cc
+++ b/src/store_swapin.cc
@@ -91,7 +91,7 @@ storeSwapInFileOpened(void *data, int fd, int errcode)
     }
     if (e->swap_status == SWAPOUT_DONE && fstat(fd, &sb) == 0) {
        if (sb.st_size == 0 || sb.st_size != e->swap_file_sz) {
-           debug(20, 0) ("storeSwapInFileOpened: %s: Size mismatch: %d(fstat) != %d(object)\n", ctrlp->path, sb.st_size, e->swap_file_sz);
+           debug(20, 0) ("storeSwapInFileOpened: %s: Size mismatch: %d(fstat) != %d(object)\n", ctrlp->path, (int) sb.st_size, e->swap_file_sz);
            file_close(fd);
            fd = -1;
        }

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 7b29311b4428d0feed2fcab4525c18b0bec34088..01daaa8af3b91d0681efb4e4af665c28be27573b 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -183,7 +183,7 @@ storeCheckSwapOut(StoreEntry * e)
     debug(20, 3) ("storeCheckSwapOut: swap_buf_len = %d\n", (int) swap_buf_len);
     assert(swap_buf_len > 0);
     debug(20, 3) ("storeCheckSwapOut: swapping out %d bytes from %d\n",
-       swap_buf_len, mem->swapout.queue_offset);
+       swap_buf_len, (int) mem->swapout.queue_offset);
     mem->swapout.queue_offset += swap_buf_len - hdr_len;
     file_write(mem->swapout.fd,
        -1,

diff --git a/src/wais.cc b/src/wais.cc
index 77317197ee4b13e3631418bc4b442b2742da754a..2afd2ff91566aad0ab560236e3286960b5b0f13f 100644 (file)
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wais.cc,v 1.104 1998/03/27 22:44:26 wessels Exp $
+ * $Id: wais.cc,v 1.105 1998/03/28 23:24:54 wessels Exp $
  *
  * DEBUG: section 24    WAIS Relay
  * AUTHOR: Harvest Derived
@@ -187,7 +187,8 @@ waisReadReply(int fd, void *data)
        IOStats.Wais.read_hist[bin]++;
     }
     if (len < 0) {
-       debug(50, 1) ("waisReadReply: FD %d: read failure: %s.\n", xstrerror());
+       debug(50, 1) ("waisReadReply: FD %d: read failure: %s.\n",
+               fd, xstrerror());
        if (ignoreErrno(errno)) {
            /* reinstall handlers */
            /* XXX This may loop forever */