From: wessels <> Date: Fri, 24 Oct 1997 05:27:17 +0000 (+0000) Subject: gindent X-Git-Tag: SQUID_3_0_PRE1~4716 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d86029aaaf30dfafe9856c7541d2719526d1094;p=thirdparty%2Fsquid.git gindent --- diff --git a/src/client.cc b/src/client.cc index 96c0cc6e07..8647dd6eab 100644 --- a/src/client.cc +++ b/src/client.cc @@ -3,8 +3,9 @@ + /* - * $Id: client.cc,v 1.33 1997/10/23 05:13:37 wessels Exp $ + * $Id: client.cc,v 1.34 1997/10/23 23:27:17 wessels Exp $ * * DEBUG: section 0 WWW Client * AUTHOR: Harvest Derived diff --git a/src/disk.cc b/src/disk.cc index 5a3be8f112..5bab56b02e 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -1,5 +1,5 @@ /* - * $Id: disk.cc,v 1.84 1997/10/23 23:20:19 wessels Exp $ + * $Id: disk.cc,v 1.85 1997/10/23 23:27:18 wessels Exp $ * * DEBUG: section 6 Disk I/O Routines * AUTHOR: Harvest Derived @@ -446,7 +446,7 @@ diskHandleReadComplete(void *data, int len, int errcode) rc = DISK_EOF; } if (cbdataValid(ctrl_dat->client_data)) - ctrl_dat->handler(fd, ctrl_dat->buf, len, rc, ctrl_dat->client_data); + ctrl_dat->handler(fd, ctrl_dat->buf, len, rc, ctrl_dat->client_data); cbdataUnlock(ctrl_dat->client_data); safe_free(ctrl_dat); } diff --git a/src/enums.h b/src/enums.h index d82b051dbe..31ac850280 100644 --- a/src/enums.h +++ b/src/enums.h @@ -219,9 +219,9 @@ enum { }; enum { - STORE_NON_CLIENT, - STORE_MEM_CLIENT, - STORE_DISK_CLIENT + STORE_NON_CLIENT, + STORE_MEM_CLIENT, + STORE_DISK_CLIENT }; enum { diff --git a/src/http.cc b/src/http.cc index 2e3952a12a..138b38128d 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1,6 +1,6 @@ /* - * $Id: http.cc,v 1.197 1997/10/23 23:22:15 wessels Exp $ + * $Id: http.cc,v 1.198 1997/10/23 23:27:19 wessels Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -666,7 +666,7 @@ httpReadReply(int fd, void *data) httpState->eof = 1; if (httpState->reply_hdr_state < 2) httpProcessReplyHeader(httpState, buf, len); - /* storeAppend(entry, buf, len); /* invoke handlers! */ + /* storeAppend(entry, buf, len); /* invoke handlers! */ storeComplete(entry); /* deallocates mem_obj->request */ comm_close(fd); } else { diff --git a/src/store.cc b/src/store.cc index 35ececd93c..95a247607f 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.304 1997/10/23 23:26:45 wessels Exp $ + * $Id: store.cc,v 1.305 1997/10/23 23:27:20 wessels Exp $ * * DEBUG: section 20 Storeage Manager * AUTHOR: Harvest Derived @@ -275,7 +275,7 @@ static int storeKeepInMemory(const StoreEntry *); static SIH storeClientCopyFileOpened; static DRCB storeClientCopyHandleRead; static FOCB storeSwapInFileOpened; -static void storeClientCopyFileRead(store_client *sc); +static void storeClientCopyFileRead(store_client * sc); static void storeInMemAdd(StoreEntry * e); static void storeInMemDelete(StoreEntry * e); static void storeSetMemStatus(StoreEntry * e, int); @@ -773,7 +773,7 @@ storeLowestMemReaderOffset(const StoreEntry * entry) off_t lowest = mem->inmem_hi; store_client *sc; store_client *nx = NULL; - for (sc = mem->clients; sc; sc=nx) { + for (sc = mem->clients; sc; sc = nx) { nx = sc->next; if (sc->callback_data == NULL) /* open slot */ continue; @@ -798,7 +798,7 @@ InvokeHandlers(const StoreEntry * e) assert(mem->clients != NULL || mem->nclients == 0); debug(20, 3) ("InvokeHandlers: %s\n", e->key); /* walk the entire list looking for valid callbacks */ - for (sc = mem->clients; sc; sc=nx) { + for (sc = mem->clients; sc; sc = nx) { nx = sc->next; debug(20, 3) ("InvokeHandlers: checking client #%d\n", i++); if (sc->callback_data == NULL) @@ -1074,8 +1074,8 @@ storeSwapInStart(StoreEntry * e, SIH * callback, void *callback_data) if (!BIT_TEST(e->flag, ENTRY_VALIDATED)) { if (storeDirMapBitTest(e->swap_file_number)) { /* someone took our file while we weren't looking */ - debug(0,0)("storeSwapInStart: someone took our file while we weren't looking\n"); - debug(0,0)("storeSwapInStart: for %s\n", e->url); + debug(0, 0) ("storeSwapInStart: someone took our file while we weren't looking\n"); + debug(0, 0) ("storeSwapInStart: for %s\n", e->url); callback(-1, callback_data); return; } @@ -1892,7 +1892,7 @@ storeClientListAdd(StoreEntry * e, void *data) return; mem->nclients++; sc = xcalloc(1, sizeof(store_client)); - cbdataAdd(sc); /* sc is callback_data for file_read */ + cbdataAdd(sc); /* sc is callback_data for file_read */ sc->callback_data = data; sc->seen_offset = 0; sc->copy_offset = 0; @@ -1982,9 +1982,9 @@ storeClientCopyFileOpened(int fd, void *data) } static void -storeClientCopyFileRead(store_client *sc) +storeClientCopyFileRead(store_client * sc) { - assert (sc->callback != NULL); + assert(sc->callback != NULL); file_read(sc->swapin_fd, sc->copy_buf, sc->copy_size, @@ -2342,7 +2342,7 @@ storePendingNClients(const StoreEntry * e) int i; if (mem == NULL) return 0; - for (sc = mem->clients; sc; sc=nx) { + for (sc = mem->clients; sc; sc = nx) { nx = sc->next; if (sc->callback_data == NULL) continue;