s/delay_id/delayId/g on members and local variables to avoid clash with

delay_id type name.

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index 2ec830e62833a4a31225a2e16a4254a406b0310a..7c35e4d221ccac5dde43fc608f109c91fe66367f 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: delay_pools.cc,v 1.27 2002/10/13 23:48:24 hno Exp $
+ * $Id: delay_pools.cc,v 1.28 2002/10/14 07:35:45 hno Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: David Luyer <david@luyer.net>
@@ -302,7 +302,7 @@ delayIsNoDelay(int fd)
 static delay_id
 delayId(unsigned short pool, unsigned short position)
 {
-    return (pool << 16) | position;
+    return (delay_id)((pool << 16) | position);
 }
 
 delay_id
@@ -661,7 +661,7 @@ delayMostBytesWanted(const MemObject * mem, int max)
        wanted = sc->copyInto.length;
        if (wanted > max)
            wanted = max;
-       i = delayBytesWanted(sc->delay_id, i, wanted);
+       i = delayBytesWanted(sc->delayId, i, wanted);
        found = 1;
     }
     return found ? i : max;
@@ -681,21 +681,21 @@ delayMostBytesAllowed(const MemObject * mem)
            continue;
        if (sc->type != STORE_MEM_CLIENT)
            continue;
-       j = delayBytesWanted(sc->delay_id, 0, sc->copyInto.length);
+       j = delayBytesWanted(sc->delayId, 0, sc->copyInto.length);
        if (j > jmax) {
            jmax = j;
-           d = sc->delay_id;
+           d = sc->delayId;
        }
     }
     return d;
 }
 
 void
-delaySetStoreClient(store_client * sc, delay_id delay_id)
+delaySetStoreClient(store_client * sc, delay_id delayId)
 {
     assert(sc != NULL);
-    sc->delay_id = delay_id;
-    delayRegisterDelayIdPtr(&sc->delay_id);
+    sc->delayId = delayId;
+    delayRegisterDelayIdPtr(&sc->delayId);
 }
 
 static void

diff --git a/src/ftp.cc b/src/ftp.cc
index 7b9bb49c8e48ca83e58e44cc0fc6172fd92d69b8..6e801cf6d1b53a9790251c8eb6e9ab3550b35570 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.329 2002/10/13 20:35:01 robertc Exp $
+ * $Id: ftp.cc,v 1.330 2002/10/14 07:35:45 hno Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -883,7 +883,7 @@ ftpDataRead(int fd, void *data)
     size_t read_sz;
 #if DELAY_POOLS
     MemObject *mem = entry->mem_obj;
-    delay_id delay_id = delayMostBytesAllowed(mem);
+    delay_id delayId = delayMostBytesAllowed(mem);
 #endif
     assert(fd == ftpState->data.fd);
     if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
@@ -893,7 +893,7 @@ ftpDataRead(int fd, void *data)
     errno = 0;
     read_sz = ftpState->data.size - ftpState->data.offset;
 #if DELAY_POOLS
-    read_sz = delayBytesWanted(delay_id, 1, read_sz);
+    read_sz = delayBytesWanted(delayId, 1, read_sz);
 #endif
     memset(ftpState->data.buf + ftpState->data.offset, '\0', read_sz);
     statCounter.syscalls.sock.reads++;
@@ -901,7 +901,7 @@ ftpDataRead(int fd, void *data)
     if (len > 0) {
        fd_bytes(fd, len, FD_READ);
 #if DELAY_POOLS
-       delayBytesIn(delay_id, len);
+       delayBytesIn(delayId, len);
 #endif
        kb_incr(&statCounter.server.all.kbytes_in, len);
        kb_incr(&statCounter.server.ftp.kbytes_in, len);

diff --git a/src/gopher.cc b/src/gopher.cc
index c0c407b184c6732c43812a62815c3654fbc654aa..5228f165e4b59ba6c75828d55252c3f7cda37573 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: gopher.cc,v 1.173 2002/10/13 20:35:01 robertc Exp $
+ * $Id: gopher.cc,v 1.174 2002/10/14 07:35:45 hno Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -625,7 +625,7 @@ gopherReadReply(int fd, void *data)
     int bin;
     size_t read_sz;
 #if DELAY_POOLS
-    delay_id delay_id = delayMostBytesAllowed(entry->mem_obj);
+    delay_id delayId = delayMostBytesAllowed(entry->mem_obj);
 #endif
     if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
        comm_close(fd);
@@ -635,7 +635,7 @@ gopherReadReply(int fd, void *data)
     buf = (char *)memAllocate(MEM_4K_BUF);
     read_sz = 4096 - 1;                /* leave room for termination */
 #if DELAY_POOLS
-    read_sz = delayBytesWanted(delay_id, 1, read_sz);
+    read_sz = delayBytesWanted(delayId, 1, read_sz);
 #endif
     /* leave one space for \0 in gopherToHTML */
     statCounter.syscalls.sock.reads++;
@@ -643,7 +643,7 @@ gopherReadReply(int fd, void *data)
     if (len > 0) {
        fd_bytes(fd, len, FD_READ);
 #if DELAY_POOLS
-       delayBytesIn(delay_id, len);
+       delayBytesIn(delayId, len);
 #endif
        kb_incr(&statCounter.server.all.kbytes_in, len);
        kb_incr(&statCounter.server.other.kbytes_in, len);

diff --git a/src/http.cc b/src/http.cc
index 707c65b4add4e8f8309ddc383575f659d01dc5be..e97dcf0c9a4ef8493e8a2147c02b296ccea8320b 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.395 2002/10/13 20:35:01 robertc Exp $
+ * $Id: http.cc,v 1.396 2002/10/14 07:35:46 hno Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -566,13 +566,13 @@ httpReadReply(int fd, void *data)
     int clen;
     size_t read_sz;
 #if DELAY_POOLS
-    delay_id delay_id;
+    delay_id delayId;
 
     /* special "if" only for http (for nodelay proxy conns) */
     if (delayIsNoDelay(fd))
-       delay_id = 0;
+       delayId = 0;
     else
-       delay_id = delayMostBytesAllowed(entry->mem_obj);
+       delayId = delayMostBytesAllowed(entry->mem_obj);
 #endif
     if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
        comm_close(fd);
@@ -582,7 +582,7 @@ httpReadReply(int fd, void *data)
     errno = 0;
     read_sz = SQUID_TCP_SO_RCVBUF;
 #if DELAY_POOLS
-    read_sz = delayBytesWanted(delay_id, 1, read_sz);
+    read_sz = delayBytesWanted(delayId, 1, read_sz);
 #endif
     statCounter.syscalls.sock.reads++;
     len = FD_READ_METHOD(fd, buf, read_sz);
@@ -590,7 +590,7 @@ httpReadReply(int fd, void *data)
     if (len > 0) {
        fd_bytes(fd, len, FD_READ);
 #if DELAY_POOLS
-       delayBytesIn(delay_id, len);
+       delayBytesIn(delayId, len);
 #endif
        kb_incr(&statCounter.server.all.kbytes_in, len);
        kb_incr(&statCounter.server.http.kbytes_in, len);

diff --git a/src/ssl.cc b/src/ssl.cc
index 1d298900e66223ffe83577c59bb362f4a8e90931..bb5a722a1dc2da1700ece502d3992d3e5cd83e80 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.124 2002/10/13 20:35:03 robertc Exp $
+ * $Id: ssl.cc,v 1.125 2002/10/14 07:35:46 hno Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -49,7 +49,7 @@ typedef struct {
     size_t *size_ptr;          /* pointer to size in an ConnStateData for logging */
     int *status_ptr;           /* pointer to status for logging */
 #if DELAY_POOLS
-    delay_id delay_id;
+    delay_id delayId;
 #endif
 } SslStateData;
 
@@ -110,7 +110,7 @@ sslStateFree(SslStateData * sslState)
     requestUnlink(sslState->request);
     sslState->request = NULL;
 #if DELAY_POOLS
-    delayUnregisterDelayIdPtr(&sslState->delay_id);
+    delayUnregisterDelayIdPtr(&sslState->delayId);
 #endif
     cbdataFree(sslState);
 }
@@ -120,7 +120,7 @@ static int
 sslDeferServerRead(int fdnotused, void *data)
 {
     SslStateData *s = (SslStateData *)data;
-    int i = delayBytesWanted(s->delay_id, 0, INT_MAX);
+    int i = delayBytesWanted(s->delayId, 0, INT_MAX);
     if (i == INT_MAX)
        return 0;
     if (i == 0)
@@ -168,7 +168,7 @@ sslSetSelect(SslStateData * sslState)
         * no data flowing in the other direction.  Hence the argument of
         * 1 as min.
         */
-       read_sz = delayBytesWanted(sslState->delay_id, 1, read_sz);
+       read_sz = delayBytesWanted(sslState->delayId, 1, read_sz);
 #endif
        if ((size_t)sslState->server.len < read_sz) {
            /* Have room to read more */
@@ -197,7 +197,7 @@ sslReadServer(int fd, void *data)
        fd, (int) read_sz, sslState->server.len);
     errno = 0;
 #if DELAY_POOLS
-    read_sz = delayBytesWanted(sslState->delay_id, 1, read_sz);
+    read_sz = delayBytesWanted(sslState->delayId, 1, read_sz);
 #endif
     statCounter.syscalls.sock.reads++;
     len = FD_READ_METHOD(fd, sslState->server.buf + sslState->server.len, read_sz);
@@ -205,7 +205,7 @@ sslReadServer(int fd, void *data)
     if (len > 0) {
        fd_bytes(fd, len, FD_READ);
 #if DELAY_POOLS
-       delayBytesIn(sslState->delay_id, len);
+       delayBytesIn(sslState->delayId, len);
 #endif
        kb_incr(&statCounter.server.all.kbytes_in, len);
        kb_incr(&statCounter.server.other.kbytes_in, len);
@@ -490,8 +490,8 @@ sslStart(clientHttpRequest * http, size_t * size_ptr, int *status_ptr)
     CBDATA_INIT_TYPE(SslStateData);
     sslState = cbdataAlloc(SslStateData);
 #if DELAY_POOLS
-    sslState->delay_id = delayClient(http);
-    delayRegisterDelayIdPtr(&sslState->delay_id);
+    sslState->delayId = delayClient(http);
+    delayRegisterDelayIdPtr(&sslState->delayId);
 #endif
     sslState->url = xstrdup(url);
     sslState->request = requestLink(request);
@@ -596,9 +596,9 @@ sslPeerSelectComplete(FwdServer * fs, void *data)
     }
 #if DELAY_POOLS
     /* no point using the delayIsNoDelay stuff since ssl is nice and simple */
-    if (g && g->options.no_delay && sslState->delay_id) {
-       delayUnregisterDelayIdPtr(&sslState->delay_id);
-       sslState->delay_id = 0;
+    if (g && g->options.no_delay && sslState->delayId) {
+       delayUnregisterDelayIdPtr(&sslState->delayId);
+       sslState->delayId = 0;
     }
 #endif
     commConnectStart(sslState->server.fd,

diff --git a/src/store_client.cc b/src/store_client.cc
index 3fb5ce042371f9cf6c3a9db43e5a24aadc57c958..80598255a82962c0d92a8417b41f17f779e040c9 100644 (file)
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.cc,v 1.115 2002/10/13 20:35:05 robertc Exp $
+ * $Id: store_client.cc,v 1.116 2002/10/14 07:35:46 hno Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -145,7 +145,7 @@ storeClientListAdd(StoreEntry * e, void *data)
        assert(e->swap_filen > -1 || storeSwapOutAble(e));
     dlinkAdd(sc, &sc->node, &mem->clients);
 #if DELAY_POOLS
-    sc->delay_id = 0;
+    sc->delayId = 0;
 #endif
     return sc;
 }
@@ -554,7 +554,7 @@ storeUnregister(store_client * sc, StoreEntry * e, void *data)
        storeClientCallback(sc, -1);
     }
 #if DELAY_POOLS
-    delayUnregisterDelayIdPtr(&sc->delay_id);
+    delayUnregisterDelayIdPtr(&sc->delayId);
 #endif
 #if STORE_CLIENT_LIST_DEBUG
     cbdataReferenceDone(sc->owner);

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 608d1daf90bb32c71bb616c7546ae25cb408ca6a..4fe649c053214a788b1e8e001262b6e0e9ee2ce3 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.124 2002/10/13 20:35:03 robertc Exp $
+ * $Id: tunnel.cc,v 1.125 2002/10/14 07:35:46 hno Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -49,7 +49,7 @@ typedef struct {
     size_t *size_ptr;          /* pointer to size in an ConnStateData for logging */
     int *status_ptr;           /* pointer to status for logging */
 #if DELAY_POOLS
-    delay_id delay_id;
+    delay_id delayId;
 #endif
 } SslStateData;
 
@@ -110,7 +110,7 @@ sslStateFree(SslStateData * sslState)
     requestUnlink(sslState->request);
     sslState->request = NULL;
 #if DELAY_POOLS
-    delayUnregisterDelayIdPtr(&sslState->delay_id);
+    delayUnregisterDelayIdPtr(&sslState->delayId);
 #endif
     cbdataFree(sslState);
 }
@@ -120,7 +120,7 @@ static int
 sslDeferServerRead(int fdnotused, void *data)
 {
     SslStateData *s = (SslStateData *)data;
-    int i = delayBytesWanted(s->delay_id, 0, INT_MAX);
+    int i = delayBytesWanted(s->delayId, 0, INT_MAX);
     if (i == INT_MAX)
        return 0;
     if (i == 0)
@@ -168,7 +168,7 @@ sslSetSelect(SslStateData * sslState)
         * no data flowing in the other direction.  Hence the argument of
         * 1 as min.
         */
-       read_sz = delayBytesWanted(sslState->delay_id, 1, read_sz);
+       read_sz = delayBytesWanted(sslState->delayId, 1, read_sz);
 #endif
        if ((size_t)sslState->server.len < read_sz) {
            /* Have room to read more */
@@ -197,7 +197,7 @@ sslReadServer(int fd, void *data)
        fd, (int) read_sz, sslState->server.len);
     errno = 0;
 #if DELAY_POOLS
-    read_sz = delayBytesWanted(sslState->delay_id, 1, read_sz);
+    read_sz = delayBytesWanted(sslState->delayId, 1, read_sz);
 #endif
     statCounter.syscalls.sock.reads++;
     len = FD_READ_METHOD(fd, sslState->server.buf + sslState->server.len, read_sz);
@@ -205,7 +205,7 @@ sslReadServer(int fd, void *data)
     if (len > 0) {
        fd_bytes(fd, len, FD_READ);
 #if DELAY_POOLS
-       delayBytesIn(sslState->delay_id, len);
+       delayBytesIn(sslState->delayId, len);
 #endif
        kb_incr(&statCounter.server.all.kbytes_in, len);
        kb_incr(&statCounter.server.other.kbytes_in, len);
@@ -490,8 +490,8 @@ sslStart(clientHttpRequest * http, size_t * size_ptr, int *status_ptr)
     CBDATA_INIT_TYPE(SslStateData);
     sslState = cbdataAlloc(SslStateData);
 #if DELAY_POOLS
-    sslState->delay_id = delayClient(http);
-    delayRegisterDelayIdPtr(&sslState->delay_id);
+    sslState->delayId = delayClient(http);
+    delayRegisterDelayIdPtr(&sslState->delayId);
 #endif
     sslState->url = xstrdup(url);
     sslState->request = requestLink(request);
@@ -596,9 +596,9 @@ sslPeerSelectComplete(FwdServer * fs, void *data)
     }
 #if DELAY_POOLS
     /* no point using the delayIsNoDelay stuff since ssl is nice and simple */
-    if (g && g->options.no_delay && sslState->delay_id) {
-       delayUnregisterDelayIdPtr(&sslState->delay_id);
-       sslState->delay_id = 0;
+    if (g && g->options.no_delay && sslState->delayId) {
+       delayUnregisterDelayIdPtr(&sslState->delayId);
+       sslState->delayId = 0;
     }
 #endif
     commConnectStart(sslState->server.fd,

diff --git a/src/wais.cc b/src/wais.cc
index 6bef2d38764ae5b819fcc30c983a6fd0cd4b0934..9d70edd6fbd2c6078f94bc6e75d8144776c285e0 100644 (file)
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wais.cc,v 1.140 2002/10/13 20:35:06 robertc Exp $
+ * $Id: wais.cc,v 1.141 2002/10/14 07:35:46 hno Exp $
  *
  * DEBUG: section 24    WAIS Relay
  * AUTHOR: Harvest Derived
@@ -92,7 +92,7 @@ waisReadReply(int fd, void *data)
     int bin;
     size_t read_sz;
 #if DELAY_POOLS
-    delay_id delay_id = delayMostBytesAllowed(entry->mem_obj);
+    delay_id delayId = delayMostBytesAllowed(entry->mem_obj);
 #endif
     if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
        comm_close(fd);
@@ -101,14 +101,14 @@ waisReadReply(int fd, void *data)
     errno = 0;
     read_sz = 4096;
 #if DELAY_POOLS
-    read_sz = delayBytesWanted(delay_id, 1, read_sz);
+    read_sz = delayBytesWanted(delayId, 1, read_sz);
 #endif
     statCounter.syscalls.sock.reads++;
     len = FD_READ_METHOD(fd, buf, read_sz);
     if (len > 0) {
        fd_bytes(fd, len, FD_READ);
 #if DELAY_POOLS
-       delayBytesIn(delay_id, len);
+       delayBytesIn(delayId, len);
 #endif
        kb_incr(&statCounter.server.all.kbytes_in, len);
        kb_incr(&statCounter.server.other.kbytes_in, len);