From e82d6d2153bd973950f363930b476d692b963ccc Mon Sep 17 00:00:00 2001 From: wessels <> Date: Fri, 21 Aug 1998 04:29:53 +0000 Subject: [PATCH] gindent --- src/acl.cc | 24 ++++++++++++------------ src/authenticate.cc | 6 +++--- src/debug.cc | 4 ++-- src/delay_pools.cc | 4 ++-- src/disk.cc | 16 ++++++++-------- src/enums.h | 4 ++-- src/http.cc | 4 ++-- src/peer_select.cc | 4 ++-- src/ssl.cc | 12 ++++++------ src/stat.cc | 4 ++-- src/store.cc | 10 +++++----- src/store_client.cc | 4 ++-- src/tunnel.cc | 12 ++++++------ 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/acl.cc b/src/acl.cc index d015e6405d..69a946b572 100644 --- a/src/acl.cc +++ b/src/acl.cc @@ -1,6 +1,6 @@ /* - * $Id: acl.cc,v 1.179 1998/08/18 21:04:42 wessels Exp $ + * $Id: acl.cc,v 1.180 1998/08/20 22:29:53 wessels Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -1754,7 +1754,7 @@ aclDumpIpListWalkee(void *node, void *state) } static wordlist * -aclDumpIpList(void * data) +aclDumpIpList(void *data) { wordlist *w = NULL; splay_walk(data, aclDumpIpListWalkee, &w); @@ -2071,12 +2071,12 @@ aclArpCompare(const void *data, splayNode * n) { const unsigned short *d1 = data; const unsigned short *d2 = n->data; - if(d1[0] != d2[0]) - return (d1[0] > d2[0]) ? 1 : -1; - if(d1[1] != d2[1]) - return (d1[1] > d2[1]) ? 1 : -1; - if(d1[2] != d2[2]) - return (d1[2] > d2[2]) ? 1 : -1; + if (d1[0] != d2[0]) + return (d1[0] > d2[0]) ? 1 : -1; + if (d1[1] != d2[1]) + return (d1[1] > d2[1]) ? 1 : -1; + if (d1[2] != d2[2]) + return (d1[2] > d2[2]) ? 1 : -1; return 0; } @@ -2093,7 +2093,7 @@ checkARP(u_long ip, char *eth) arpReq.arp_flags = 0; /* any AF_INET socket will do... gives back hardware type, device, etc */ if (ioctl(HttpSockets[0], SIOCGARP, &arpReq) == -1) { - debug(28, 1) ("ARP query failed - %d", errno); + debug(28, 1) ("ARP query failed - %d", errno); return 0; } else if (arpReq.arp_ha.sa_family != ARPHRD_ETHER) { debug(28, 1) ("Non-ethernet interface returned from ARP query - %d", @@ -2108,13 +2108,13 @@ checkARP(u_long ip, char *eth) static int aclMatchArp(void *dataptr, struct in_addr c) { - WRITE ME; + WRITE ME; } static int aclArpCompare(const void *data, splayNode * n) { - WRITE ME; + WRITE ME; } static int @@ -2175,7 +2175,7 @@ aclDumpArpWalkee(void *node, void *state) } static wordlist * -aclDumpArpList(void * data) +aclDumpArpList(void *data) { wordlist *w = NULL; splay_walk(data, aclDumpArpListWalkee, &w); diff --git a/src/authenticate.cc b/src/authenticate.cc index 158ef85d1f..99fa55d6e2 100644 --- a/src/authenticate.cc +++ b/src/authenticate.cc @@ -1,6 +1,6 @@ /* - * $Id: authenticate.cc,v 1.1 1998/08/18 02:56:42 wessels Exp $ + * $Id: authenticate.cc,v 1.2 1998/08/20 22:29:54 wessels Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -250,7 +250,7 @@ authenticateStart(acl_proxy_auth_user * auth_user, RH * handler, void *data) if (!handler) fatal_dump("authenticateStart: NULL handler"); debug(29, 5) ("authenticateStart: '%s:%s'\n", auth_user->user, - auth_user->passwd); + auth_user->passwd); if (Config.Program.authenticate == NULL) { handler(data, NULL); return; @@ -394,7 +394,7 @@ authenticateShutdownServers(void *unused) EBIT_SET(authenticate->flags, HELPER_BUSY); } if (na) - eventAdd("authenticateShutdownServers", authenticateShutdownServers, NULL, 1.0, 1); + eventAdd("authenticateShutdownServers", authenticateShutdownServers, NULL, 1.0, 1); } int diff --git a/src/debug.cc b/src/debug.cc index 18849de730..7d04fe94d2 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -1,6 +1,6 @@ /* - * $Id: debug.cc,v 1.70 1998/08/19 22:23:48 wessels Exp $ + * $Id: debug.cc,v 1.71 1998/08/20 22:29:55 wessels Exp $ * * DEBUG: section 0 Debug Routines * AUTHOR: Harvest Derived @@ -84,7 +84,7 @@ _db_print(va_alist) if (_db_level <= 1 && opt_syslog_enable) { tmpbuf[0] = '\0'; vsnprintf(tmpbuf, BUFSIZ, format, args); - tmpbuf[BUFSIZ-1] = '\0'; + tmpbuf[BUFSIZ - 1] = '\0'; syslog(_db_level == 0 ? LOG_WARNING : LOG_NOTICE, "%s", tmpbuf); } #endif /* HAVE_SYSLOG */ diff --git a/src/delay_pools.cc b/src/delay_pools.cc index 76e38cf25e..de6740f986 100644 --- a/src/delay_pools.cc +++ b/src/delay_pools.cc @@ -1,6 +1,6 @@ /* - * $Id: delay_pools.cc,v 1.3 1998/08/17 16:44:03 wessels Exp $ + * $Id: delay_pools.cc,v 1.4 1998/08/20 22:29:56 wessels Exp $ * * DEBUG: section 77 Delay Pools * AUTHOR: David Luyer @@ -422,7 +422,7 @@ delayMostBytesWanted(const MemObject * mem, int max) if (sc->type != STORE_MEM_CLIENT) continue; i = delayBytesWanted(sc->delay_id, i, max); - found = 1; + found = 1; } return found ? i : max; } diff --git a/src/disk.cc b/src/disk.cc index 00b579eaa6..632285b936 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -1,7 +1,7 @@ /* - * $Id: disk.cc,v 1.129 1998/08/20 16:04:07 wessels Exp $ + * $Id: disk.cc,v 1.130 1998/08/20 22:29:57 wessels Exp $ * * DEBUG: section 6 Disk I/O Routines * AUTHOR: Harvest Derived @@ -401,12 +401,12 @@ file_write(int fd, diskHandleWrite(fd, NULL); #else #ifdef OPTIMISTIC_IO - if (F->flags.calling_io_handler) + if (F->flags.calling_io_handler) #endif - commSetSelect(fd, COMM_SELECT_WRITE, diskHandleWrite, NULL, 0); + commSetSelect(fd, COMM_SELECT_WRITE, diskHandleWrite, NULL, 0); #ifdef OPTIMISTIC_IO - else - diskHandleWrite(fd, NULL); + else + diskHandleWrite(fd, NULL); #endif #endif #ifndef OPTIMISTIC_IO @@ -442,7 +442,7 @@ diskHandleRead(int fd, void *data) * the state data. */ if (fd < 0) { - memFree(MEM_DREAD_CTRL, ctrl_dat); + memFree(MEM_DREAD_CTRL, ctrl_dat); return; } #if USE_ASYNC_IO @@ -461,7 +461,7 @@ diskHandleRead(int fd, void *data) } len = read(fd, ctrl_dat->buf, ctrl_dat->req_len); if (len > 0) - F->disk.offset += len; + F->disk.offset += len; diskHandleReadComplete(fd, ctrl_dat, len, errno); #endif } @@ -539,7 +539,7 @@ file_read(int fd, char *buf, int req_len, off_t offset, DRCB * handler, void *cl if (F->flags.calling_io_handler) commSetSelect(fd, COMM_SELECT_READ, diskHandleRead, ctrl_dat, 0); else - diskHandleRead(fd, ctrl_dat); + diskHandleRead(fd, ctrl_dat); #endif /* OPTIMISTIC_IO */ #endif return DISK_OK; diff --git a/src/enums.h b/src/enums.h index 841e0efd2f..d07b3e893b 100644 --- a/src/enums.h +++ b/src/enums.h @@ -1,6 +1,6 @@ /* - * $Id: enums.h,v 1.119 1998/08/19 06:05:51 wessels Exp $ + * $Id: enums.h,v 1.120 1998/08/20 22:29:58 wessels Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -449,7 +449,7 @@ enum { ENTRY_UNUSED_08, #else ENTRY_FWD_HDR_WAIT, -#endif /* PPNR_WIP */ +#endif /* PPNR_WIP */ ENTRY_NEGCACHED, ENTRY_VALIDATED, ENTRY_BAD_LENGTH diff --git a/src/http.cc b/src/http.cc index 1fc8adfa69..dc06e5b5eb 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1,6 +1,6 @@ /* - * $Id: http.cc,v 1.310 1998/08/20 22:21:02 wessels Exp $ + * $Id: http.cc,v 1.311 1998/08/20 22:29:59 wessels Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -479,7 +479,7 @@ httpReadReply(int fd, void *data) httpProcessReplyHeader(httpState, buf, len); #ifdef PPNR_WIP if (httpState->reply_hdr_state == 2) - storePPNR(entry); + storePPNR(entry); } #endif /* PPNR_WIP */ storeAppend(entry, buf, len); diff --git a/src/peer_select.cc b/src/peer_select.cc index 727e37bbeb..7bf1e91d45 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -1,6 +1,6 @@ /* - * $Id: peer_select.cc,v 1.74 1998/08/19 23:10:30 wessels Exp $ + * $Id: peer_select.cc,v 1.75 1998/08/20 22:30:00 wessels Exp $ * * DEBUG: section 44 Peer Selection Algorithm * AUTHOR: Duane Wessels @@ -295,7 +295,7 @@ peerSelectFoo(ps_state * psstate) return; } if ((p = getSingleParent(request))) { - psstate->single_parent = p->in_addr; + psstate->single_parent = p->in_addr; debug(44, 3) ("peerSelect: found single parent, skipping ICP query\n"); } #if USE_CACHE_DIGESTS diff --git a/src/ssl.cc b/src/ssl.cc index cbb63e2840..1283c72516 100644 --- a/src/ssl.cc +++ b/src/ssl.cc @@ -1,6 +1,6 @@ /* - * $Id: ssl.cc,v 1.87 1998/08/17 16:44:11 wessels Exp $ + * $Id: ssl.cc,v 1.88 1998/08/20 22:30:01 wessels Exp $ * * DEBUG: section 26 Secure Sockets Layer Proxy * AUTHOR: Duane Wessels @@ -150,11 +150,11 @@ sslSetSelect(SslStateData * sslState) } #if DELAY_POOLS /* If this was allowed to return 0, there would be a possibility - * of the socket becoming "hung" with data accumulating but no - * write handler (server.len==0) and no read handler (!(0<0)) and - * no data flowing in the other direction. Hence the argument of - * 1 as min. - */ + * of the socket becoming "hung" with data accumulating but no + * write handler (server.len==0) and no read handler (!(0<0)) and + * no data flowing in the other direction. Hence the argument of + * 1 as min. + */ read_sz = delayBytesWanted(sslState->request->delay_id, 1, read_sz); #endif if (sslState->server.len < read_sz) { diff --git a/src/stat.cc b/src/stat.cc index b0db6aa727..9e646e150f 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -1,6 +1,6 @@ /* - * $Id: stat.cc,v 1.278 1998/08/16 06:35:17 wessels Exp $ + * $Id: stat.cc,v 1.279 1998/08/20 22:30:02 wessels Exp $ * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived @@ -831,7 +831,7 @@ statAvgTick(void *notused) /* we have an hours worth of readings. store previous hour */ StatCounters *t = &CountHourHist[0]; StatCounters *p = &CountHourHist[1]; - StatCounters *c = &CountHist[N_COUNT_HIST-1]; + StatCounters *c = &CountHist[N_COUNT_HIST - 1]; statCountersClean(CountHourHist + N_COUNT_HOUR_HIST - 1); xmemmove(p, t, (N_COUNT_HOUR_HIST - 1) * sizeof(StatCounters)); statCountersCopy(t, c); diff --git a/src/store.cc b/src/store.cc index 11a9ac0d46..1ba6fdc60e 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.446 1998/08/19 06:05:55 wessels Exp $ + * $Id: store.cc,v 1.447 1998/08/20 22:30:04 wessels Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -135,7 +135,7 @@ destroy_MemObject(StoreEntry * e) debug(20, 3) ("destroy_MemObject: destroying %p\n", mem); e->mem_obj = NULL; if (!shutting_down) - assert(mem->swapout.fd == -1); + assert(mem->swapout.fd == -1); stmemFree(&mem->data_hdr); mem->inmem_hi = 0; /* XXX account log_url */ @@ -483,10 +483,10 @@ storeComplete(StoreEntry * e) } void -storePPNR(StoreEntry *e) +storePPNR(StoreEntry * e) { - assert(EBIT_TEST(e->flag, ENTRY_FWD_HDR_WAIT)); - EBIT_CLR(e->flag, ENTRY_FWD_HDR_WAIT); + assert(EBIT_TEST(e->flag, ENTRY_FWD_HDR_WAIT)); + EBIT_CLR(e->flag, ENTRY_FWD_HDR_WAIT); #endif /* PPNR_WIP */ } diff --git a/src/store_client.cc b/src/store_client.cc index dbf91e165a..e91210b2b2 100644 --- a/src/store_client.cc +++ b/src/store_client.cc @@ -1,6 +1,6 @@ /* - * $Id: store_client.cc,v 1.38 1998/08/19 06:05:56 wessels Exp $ + * $Id: store_client.cc,v 1.39 1998/08/20 22:30:05 wessels Exp $ * * DEBUG: section 20 Storage Manager Client-Side Interface * AUTHOR: Duane Wessels @@ -288,7 +288,7 @@ storeClientFileRead(store_client * sc) storeClientReadHeader, sc); #ifndef OPTIMISTIC_IO - else { + else { #else } else { #endif diff --git a/src/tunnel.cc b/src/tunnel.cc index 39983821a6..7e9d3bbfda 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -1,6 +1,6 @@ /* - * $Id: tunnel.cc,v 1.87 1998/08/17 16:44:11 wessels Exp $ + * $Id: tunnel.cc,v 1.88 1998/08/20 22:30:01 wessels Exp $ * * DEBUG: section 26 Secure Sockets Layer Proxy * AUTHOR: Duane Wessels @@ -150,11 +150,11 @@ sslSetSelect(SslStateData * sslState) } #if DELAY_POOLS /* If this was allowed to return 0, there would be a possibility - * of the socket becoming "hung" with data accumulating but no - * write handler (server.len==0) and no read handler (!(0<0)) and - * no data flowing in the other direction. Hence the argument of - * 1 as min. - */ + * of the socket becoming "hung" with data accumulating but no + * write handler (server.len==0) and no read handler (!(0<0)) and + * no data flowing in the other direction. Hence the argument of + * 1 as min. + */ read_sz = delayBytesWanted(sslState->request->delay_id, 1, read_sz); #endif if (sslState->server.len < read_sz) { -- 2.47.3