gindent

diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index b5445ab187b215c3bb9653a18114914672b2caf5..12479dc0ca0b12ae940c58af2899ae2226e5a9a4 100644 (file)
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHdrRange.cc,v 1.14 1998/09/24 20:16:24 rousskov Exp $
+ * $Id: HttpHdrRange.cc,v 1.15 1998/09/29 16:33:39 wessels Exp $
  *
  * DEBUG: section 64    HTTP Range Header
  * AUTHOR: Alex Rousskov
@@ -345,7 +345,7 @@ httpHdrRangeCanonize(HttpHdrRange * range, size_t clen)
        spec = NULL;
        i++;                    /* progress */
     }
-    if (spec) /* last "merge" may not be pushed yet */
+    if (spec)                  /* last "merge" may not be pushed yet */
        stackPush(&range->specs, spec);
     debug(64, 3) ("httpHdrRangeCanonize: had %d specs, merged %d specs\n",
        goods.count, goods.count - range->specs.count);
@@ -398,12 +398,12 @@ httpHdrRangeWillBeComplex(const HttpHdrRange * range)
     /* check that all rangers are in "strong" order, */
     /* as far as we can tell without the content length */
     while ((spec = httpHdrRangeGetSpec(range, &pos))) {
-       if (!known_spec(spec->offset)) /* ignore unknowns */
+       if (!known_spec(spec->offset))  /* ignore unknowns */
            continue;
        if (spec->offset < offset)
            return 1;
        offset = spec->offset;
-       if (known_spec(spec->length))  /* avoid  unknowns */
+       if (known_spec(spec->length))   /* avoid  unknowns */
            offset += spec->length;
     }
     return 0;

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 5c6cd5b3176d2dc353b71cf1e83a90bf8e6f9209..2474fe816c3881e40e82cade377cfa9db70c7be8 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeader.cc,v 1.56 1998/09/24 20:20:22 rousskov Exp $
+ * $Id: HttpHeader.cc,v 1.57 1998/09/29 16:33:40 wessels Exp $
  *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
@@ -103,7 +103,7 @@ static const HttpHeaderFieldAttrs HeadersAttrs[] =
     {"Public", HDR_PUBLIC, ftStr},
     {"Range", HDR_RANGE, ftPRange},
     {"Referer", HDR_REFERER, ftStr},
-    {"Request-Range", HDR_REQUEST_RANGE, ftPRange}, /* usually matches HDR_RANGE */
+    {"Request-Range", HDR_REQUEST_RANGE, ftPRange},    /* usually matches HDR_RANGE */
     {"Retry-After", HDR_RETRY_AFTER, ftStr},   /* for now (ftDate_1123 or ftInt!) */
     {"Server", HDR_SERVER, ftStr},
     {"Set-Cookie", HDR_SET_COOKIE, ftStr},
@@ -187,7 +187,7 @@ static http_hdr_type RequestHeadersArr[] =
 {
     HDR_AUTHORIZATION, HDR_FROM, HDR_HOST, HDR_IF_MODIFIED_SINCE,
     HDR_IF_RANGE, HDR_MAX_FORWARDS, HDR_PROXY_CONNECTION,
-    HDR_PROXY_AUTHORIZATION, HDR_RANGE, HDR_REFERER, HDR_REQUEST_RANGE, 
+    HDR_PROXY_AUTHORIZATION, HDR_RANGE, HDR_REFERER, HDR_REQUEST_RANGE,
     HDR_USER_AGENT, HDR_X_FORWARDED_FOR
 };
 

diff --git a/src/client.cc b/src/client.cc
index 615dc4aceafbb040fdce0837638cbdef1ef70e49..fdef62b0df714c694d5beffd1065ea1be4ad5ff8 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,7 +1,8 @@
 
 
+
 /*
- * $Id: client.cc,v 1.75 1998/09/19 17:05:58 wessels Exp $
+ * $Id: client.cc,v 1.76 1998/09/29 16:33:41 wessels Exp $
  *
  * DEBUG: section 0     WWW Client
  * AUTHOR: Harvest Derived

diff --git a/src/client_db.cc b/src/client_db.cc
index a1899670d9db7a639cbee6e1699ed96e0738e263..82b7cb0c0e79bc5b7fd68d938a5c365e278a8a72 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_db.cc,v 1.40 1998/09/23 21:22:50 glenn Exp $
+ * $Id: client_db.cc,v 1.41 1998/09/29 16:33:42 wessels Exp $
  *
  * DEBUG: section 0     Client Database
  * AUTHOR: Duane Wessels
@@ -246,7 +246,7 @@ snmp_meshCtblFn(variable_list * Var, snint * ErrP)
        snmp_var_free(Answer);
        return (NULL);
     }
-    switch (Var->name[LEN_SQ_NET+2]) {
+    switch (Var->name[LEN_SQ_NET + 2]) {
     case MESH_CTBL_ADDR:
        Answer->type = SMI_IPADDRESS;
        Answer->val_len = sizeof(snint);
@@ -316,4 +316,4 @@ snmp_meshCtblFn(variable_list * Var, snint * ErrP)
     return Answer;
 }
 
-#endif /*SQUID_SNMP*/
+#endif /*SQUID_SNMP */

diff --git a/src/client_side.cc b/src/client_side.cc
index 766deea0aeb7bbb4c6caf67b71962147e91b8311..cc2161945cef56d31f3746a3c7782fd2c006e3d8 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.402 1998/09/24 20:41:19 rousskov Exp $
+ * $Id: client_side.cc,v 1.403 1998/09/29 16:33:43 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1920,29 +1920,29 @@ parseHttpRequest(ConnStateData * conn, method_t * method_p, int *status,
            url_sz = strlen(url) + 32 + Config.appendDomainLen;
            http->uri = xcalloc(url_sz, 1);
 #if IPF_TRANSPARENT
-            natLookup.nl_inport = http->conn->me.sin_port;
-            natLookup.nl_outport = http->conn->peer.sin_port;
-            natLookup.nl_inip = http->conn->me.sin_addr;
-            natLookup.nl_outip = http->conn->peer.sin_addr;
-            natLookup.nl_flags = IPN_TCP;
-            if (natfd < 0)
-               natfd = open(IPL_NAT, O_RDONLY,0 );
-            if (natfd < 0) {
-               debug(50,1)("parseHttpRequest: NAT open failed: %s\n",
-                       xstrerror());
-               return NULL;
+           natLookup.nl_inport = http->conn->me.sin_port;
+           natLookup.nl_outport = http->conn->peer.sin_port;
+           natLookup.nl_inip = http->conn->me.sin_addr;
+           natLookup.nl_outip = http->conn->peer.sin_addr;
+           natLookup.nl_flags = IPN_TCP;
+           if (natfd < 0)
+               natfd = open(IPL_NAT, O_RDONLY, 0);
+           if (natfd < 0) {
+               debug(50, 1) ("parseHttpRequest: NAT open failed: %s\n",
+                   xstrerror());
+               return NULL;
            }
-            if (ioctl(natfd, SIOCGNATL, &natLookup) < 0) {
-               debug(50,1)("parseHttpRequest: NAT lookup failed: %s\n",
-                       xstrerror());
-               close(natfd);
-               natfd = -1;
-               return NULL;
-            }
-            snprintf(http->uri, url_sz, "http://%s:%d%s",
-               inet_ntoa(natLookup.nl_realip), 
-               (int)Config.Accel.port,
-               url);
+           if (ioctl(natfd, SIOCGNATL, &natLookup) < 0) {
+               debug(50, 1) ("parseHttpRequest: NAT lookup failed: %s\n",
+                   xstrerror());
+               close(natfd);
+               natfd = -1;
+               return NULL;
+           }
+           snprintf(http->uri, url_sz, "http://%s:%d%s",
+               inet_ntoa(natLookup.nl_realip),
+               (int) Config.Accel.port,
+               url);
 #else
            snprintf(http->uri, url_sz, "http://%s:%d%s",
                inet_ntoa(http->conn->me.sin_addr),

diff --git a/src/dns.cc b/src/dns.cc
index 9cb6a2730f9948d262839505ed0c0f4bd0d6dfa4..ac70fa48d7a1cf5790b0847828f69f4f10389a14 100644 (file)
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns.cc,v 1.65 1998/09/23 21:23:33 glenn Exp $
+ * $Id: dns.cc,v 1.66 1998/09/29 16:33:44 wessels Exp $
  *
  * DEBUG: section 34    Dnsserver interface
  * AUTHOR: Harvest Derived
@@ -288,8 +288,8 @@ dnsShutdownRead(int fd, void *data)
 
 #ifdef SQUID_SNMP
 /*
-        The function to return the DNS via SNMP
-*/
+ * The function to return the DNS via SNMP
+ */
 
 variable_list *
 snmp_netDnsFn(variable_list * Var, snint * ErrP)
@@ -297,7 +297,7 @@ snmp_netDnsFn(variable_list * Var, snint * ErrP)
     variable_list *Answer;
 
     debug(49, 5) ("snmp_netDnsFn: Processing request:\n", Var->name[LEN_SQ_NET +
- 1]);
+           1]);
     snmpDebugOid(5, Var->name, Var->name_length);
 
     Answer = snmp_var_new(Var->name, Var->name_length);
@@ -306,22 +306,22 @@ snmp_netDnsFn(variable_list * Var, snint * ErrP)
     Answer->val.integer = xmalloc(Answer->val_len);
     Answer->type = SMI_COUNTER32;
 
-    switch (Var->name[LEN_SQ_NET+1]) {
+    switch (Var->name[LEN_SQ_NET + 1]) {
     case DNS_REQ:
-        *(Answer->val.integer) = DnsStats.requests;
-        break;
+       *(Answer->val.integer) = DnsStats.requests;
+       break;
     case DNS_REP:
-        *(Answer->val.integer) = DnsStats.replies;
-        break;
+       *(Answer->val.integer) = DnsStats.replies;
+       break;
     case DNS_SERVERS:
-        *(Answer->val.integer) = NDnsServersAlloc;
-        break;
+       *(Answer->val.integer) = NDnsServersAlloc;
+       break;
     default:
-        *ErrP = SNMP_ERR_NOSUCHNAME;
-        snmp_var_free(Answer);
-        return (NULL);
+       *ErrP = SNMP_ERR_NOSUCHNAME;
+       snmp_var_free(Answer);
+       return (NULL);
     }
     return Answer;
 }
 
-#endif /*SQUID_SNMP*/
+#endif /*SQUID_SNMP */

diff --git a/src/enums.h b/src/enums.h
index 8d4880580b9b92ad0313ddaeac232e1f756e8998..f177c514caad6bbee01a752f4315c6b8634bbce1 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.132 1998/09/24 20:20:20 rousskov Exp $
+ * $Id: enums.h,v 1.133 1998/09/29 16:33:45 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -212,7 +212,7 @@ typedef enum {
     HDR_PROXY_CONNECTION,
     HDR_PUBLIC,
     HDR_RANGE,
-    HDR_REQUEST_RANGE,          /* some clients use this, sigh */
+    HDR_REQUEST_RANGE,         /* some clients use this, sigh */
     HDR_REFERER,
     HDR_RETRY_AFTER,
     HDR_SERVER,

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 778681946659b836c9be1900ba9b2f331452616f..b8a5f3e57cf460a993d742e183803e1b5214b212 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: fqdncache.cc,v 1.119 1998/09/23 21:29:07 glenn Exp $
+ * $Id: fqdncache.cc,v 1.120 1998/09/29 16:33:45 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -796,8 +796,8 @@ fqdncache_restart(void)
 
 #ifdef SQUID_SNMP
 /*
-        The function to return the fqdn statistics via SNMP
-*/
+ * The function to return the fqdn statistics via SNMP
+ */
 
 variable_list *
 snmp_netFqdnFn(variable_list * Var, snint * ErrP)
@@ -805,7 +805,7 @@ snmp_netFqdnFn(variable_list * Var, snint * ErrP)
     variable_list *Answer;
 
     debug(49, 5) ("snmp_netFqdnFn: Processing request:\n", Var->name[LEN_SQ_NET +
- 1]);
+           1]);
     snmpDebugOid(5, Var->name, Var->name_length);
 
     Answer = snmp_var_new(Var->name, Var->name_length);
@@ -814,40 +814,40 @@ snmp_netFqdnFn(variable_list * Var, snint * ErrP)
     Answer->val.integer = xmalloc(Answer->val_len);
     Answer->type = SMI_COUNTER32;
 
-    switch (Var->name[LEN_SQ_NET+1]) {
+    switch (Var->name[LEN_SQ_NET + 1]) {
     case FQDN_ENT:
-        *(Answer->val.integer) = memInUse(MEM_FQDNCACHE_ENTRY);
-        Answer->type = SMI_GAUGE32;
-        break;
+       *(Answer->val.integer) = memInUse(MEM_FQDNCACHE_ENTRY);
+       Answer->type = SMI_GAUGE32;
+       break;
     case FQDN_REQ:
-        *(Answer->val.integer) = FqdncacheStats.requests;
-        break;
+       *(Answer->val.integer) = FqdncacheStats.requests;
+       break;
     case FQDN_HITS:
-        *(Answer->val.integer) = FqdncacheStats.hits;
-        break;
+       *(Answer->val.integer) = FqdncacheStats.hits;
+       break;
     case FQDN_PENDHIT:
-        *(Answer->val.integer) = FqdncacheStats.pending_hits;
-        Answer->type = SMI_GAUGE32;
-        break;
+       *(Answer->val.integer) = FqdncacheStats.pending_hits;
+       Answer->type = SMI_GAUGE32;
+       break;
     case FQDN_NEGHIT:
-        *(Answer->val.integer) = FqdncacheStats.negative_hits;
-        break;
+       *(Answer->val.integer) = FqdncacheStats.negative_hits;
+       break;
     case FQDN_MISS:
-        *(Answer->val.integer) = FqdncacheStats.misses;
-        break;
+       *(Answer->val.integer) = FqdncacheStats.misses;
+       break;
     case FQDN_GHBN:
-        *(Answer->val.integer) = FqdncacheStats.ghba_calls;
-        break;
+       *(Answer->val.integer) = FqdncacheStats.ghba_calls;
+       break;
     case FQDN_LENG:
-        *(Answer->val.integer) = queue_length;
-        Answer->type = SMI_GAUGE32;
-        break;
+       *(Answer->val.integer) = queue_length;
+       Answer->type = SMI_GAUGE32;
+       break;
     default:
-        *ErrP = SNMP_ERR_NOSUCHNAME;
-        snmp_var_free(Answer);
-        return (NULL);
+       *ErrP = SNMP_ERR_NOSUCHNAME;
+       snmp_var_free(Answer);
+       return (NULL);
     }
     return Answer;
 }
 
-#endif /*SQUID_SNMP*/
+#endif /*SQUID_SNMP */

diff --git a/src/ipcache.cc b/src/ipcache.cc
index ee847c5807be246dcbab961cb3e2f317c084d3b9..e77db8bcbd5e347214b35c0e16b2ebcae82b0e76 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.202 1998/09/23 21:24:37 glenn Exp $
+ * $Id: ipcache.cc,v 1.203 1998/09/29 16:33:47 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -960,8 +960,8 @@ ipcache_restart(void)
 
 #ifdef SQUID_SNMP
 /*
-       The function to return the ip cache statistics to via SNMP
-*/
+ * The function to return the ip cache statistics to via SNMP
+ */
 
 variable_list *
 snmp_netIpFn(variable_list * Var, snint * ErrP)
@@ -977,43 +977,43 @@ snmp_netIpFn(variable_list * Var, snint * ErrP)
     Answer->val.integer = xmalloc(Answer->val_len);
     Answer->type = SMI_COUNTER32;
 
-    switch (Var->name[LEN_SQ_NET+1]) {
+    switch (Var->name[LEN_SQ_NET + 1]) {
     case IP_ENT:
        *(Answer->val.integer) = memInUse(MEM_IPCACHE_ENTRY);
        Answer->type = SMI_GAUGE32;
-        break;
+       break;
     case IP_REQ:
        *(Answer->val.integer) = IpcacheStats.requests;
-        break;
+       break;
     case IP_HITS:
        *(Answer->val.integer) = IpcacheStats.hits;
-        break;
+       break;
     case IP_PENDHIT:
        *(Answer->val.integer) = IpcacheStats.pending_hits;
        Answer->type = SMI_GAUGE32;
-        break;
+       break;
     case IP_NEGHIT:
        *(Answer->val.integer) = IpcacheStats.negative_hits;
-        break;
+       break;
     case IP_MISS:
        *(Answer->val.integer) = IpcacheStats.misses;
-        break;
+       break;
     case IP_GHBN:
        *(Answer->val.integer) = IpcacheStats.ghbn_calls;
-        break;
+       break;
     case IP_LOC:
        *(Answer->val.integer) = IpcacheStats.release_locked;
-        break;
+       break;
     case IP_LENG:
        *(Answer->val.integer) = queue_length;
        Answer->type = SMI_GAUGE32;
-        break;
+       break;
     default:
-        *ErrP = SNMP_ERR_NOSUCHNAME;
-        snmp_var_free(Answer);
-        return (NULL);
+       *ErrP = SNMP_ERR_NOSUCHNAME;
+       snmp_var_free(Answer);
+       return (NULL);
     }
     return Answer;
 }
 
-#endif /*SQUID_SNMP*/
+#endif /*SQUID_SNMP */

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index f6605394f1d577a7f0d9352678653941cfa2b2ab..f08d29f9bff2112b735690ee4768c5541fe755a7 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_digest.cc,v 1.55 1998/09/24 20:29:13 rousskov Exp $
+ * $Id: peer_digest.cc,v 1.56 1998/09/29 16:33:48 wessels Exp $
  *
  * DEBUG: section 72    Peer Digest Routines
  * AUTHOR: Alex Rousskov
@@ -64,9 +64,9 @@ static int peerDigestUseful(const peer * peer);
 #define StoreDigestCBlockSize sizeof(StoreDigestCBlock)
 
 /* min interval for requesting digests from the same peer */
-static const time_t PeerDigestRequestMinGap = 5 * 60;   /* seconds */
+static const time_t PeerDigestRequestMinGap = 5 * 60;  /* seconds */
 /* min interval for requesting digests at start */
-static const time_t GlobalDigestRequestMinGap = 1 * 60;        /* seconds */
+static const time_t GlobalDigestRequestMinGap = 1 * 60;                /* seconds */
 
 /* local vars */
 
@@ -78,7 +78,7 @@ peerDigestInit(void *data)
 {
     peer *p = data;
     assert(p);
-    if (!cbdataValid(p)) { /* peer disappeared */
+    if (!cbdataValid(p)) {     /* peer disappeared */
        cbdataUnlock(p);
        return;
     }
@@ -487,13 +487,12 @@ peerDigestFetchedEnough(DigestFetchState * fetch, char *buf, ssize_t size, const
     if (pcb_valid)
        debug(72, 6) ("%s: %s offset: %d size: %d.\n",
            step_name, fetch->peer->host, fetch->offset, size);
-    
+
 
     /* test exiting conditions */
     if (!fcb_valid)
        reason = "fetch aborted?";
-    else
-    if (!pcb_valid)
+    else if (!pcb_valid)
        reason = "peer disappeared";
     else if (size < 0)
        reason = "swap failure";

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 124559242b7df5f12cd3d185d09d177d9fdd9a13..9b9d87a8a30ba7827fc19013d45e4d0966677c9c 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_agent.cc,v 1.57 1998/09/23 23:15:53 glenn Exp $
+ * $Id: snmp_agent.cc,v 1.58 1998/09/29 16:33:49 wessels Exp $
  *
  * DEBUG: section 49     SNMP Interface
  * AUTHOR: Kostas Anagnostakis
@@ -78,11 +78,11 @@ snmp_sysFn(variable_list * Var, snint * ErrP)
        *(Answer->val.integer) = store_swap_size;
        break;
     case SYS_UPTIME:
-        Answer->val_len = sizeof(snint);
-        Answer->val.integer = xmalloc(Answer->val_len);
-        Answer->type = SMI_TIMETICKS;
-        *(Answer->val.integer) = tvSubDsec(squid_start, current_time)*100;
-        break;
+       Answer->val_len = sizeof(snint);
+       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->type = SMI_TIMETICKS;
+       *(Answer->val.integer) = tvSubDsec(squid_start, current_time) * 100;
+       break;
     default:
        *ErrP = SNMP_ERR_NOSUCHNAME;
        snmp_var_free(Answer);
@@ -338,7 +338,7 @@ snmp_prfSysFn(variable_list * Var, snint * ErrP)
        break;
     case PERF_SYS_CURLRUEXP:
        Answer->type = SMI_TIMETICKS;
-       *(Answer->val.integer) = (snint) (storeExpiredReferenceAge()*100);
+       *(Answer->val.integer) = (snint) (storeExpiredReferenceAge() * 100);
        break;
     case PERF_SYS_CURUNLREQ:
        *(Answer->val.integer) = (snint) Counter.unlink.requests;

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 9d32138326826df7ae74bf8722a687741384968e..084c1b84b443cce5873320fc78ea55f133cfed24 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: snmp_core.cc,v 1.11 1998/09/23 21:26:06 glenn Exp $
+ * $Id: snmp_core.cc,v 1.12 1998/09/29 16:33:51 wessels Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Kostas Anagnostakis
@@ -847,4 +847,3 @@ gen_getMax()
 #endif
     return &maddr;
 }
-

diff --git a/src/store_client.cc b/src/store_client.cc
index d0d17d83ccdd7952590eedbe501b5e10af7935bb..aff49c956f887915820d1f7dd2a0e6e98626b30e 100644 (file)
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.cc,v 1.46 1998/09/20 01:14:25 wessels Exp $
+ * $Id: store_client.cc,v 1.47 1998/09/29 16:33:53 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -74,14 +74,14 @@ storeClientListSearch(const MemObject * mem, void *data)
 }
 
 static store_client_t
-storeClientType(StoreEntry *e)
+storeClientType(StoreEntry * e)
 {
     MemObject *mem = e->mem_obj;
     if (mem->inmem_lo)
        return STORE_DISK_CLIENT;
     if (e->store_status == STORE_ABORTED) {
        /* I don't think we should be adding clients to aborted entries */
-       debug(20,1)("storeClientType: adding to STORE_ABORTED entry\n");
+       debug(20, 1) ("storeClientType: adding to STORE_ABORTED entry\n");
        return STORE_MEM_CLIENT;
     }
     if (e->store_status == STORE_OK) {

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 2d1c6a63b5f284b8def8984996580f2d22c7ab8c..7842f986ccb09fecc9b98dc17ad3d93a54354e98 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_swapout.cc,v 1.34 1998/09/20 01:14:25 wessels Exp $
+ * $Id: store_swapout.cc,v 1.35 1998/09/29 16:33:54 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Swapout Functions
  * AUTHOR: Duane Wessels
@@ -382,7 +382,7 @@ storeSwapOutAble(const StoreEntry * e)
      * If there are DISK clients, we must write to disk
      * even if its not cachable
      */
-    for (sc = e->mem_obj->clients; sc; sc=sc->next)
+    for (sc = e->mem_obj->clients; sc; sc = sc->next)
        if (sc->type == STORE_DISK_CLIENT)
            return 1;
     return EBIT_TEST(e->flags, ENTRY_CACHABLE);

diff --git a/src/structs.h b/src/structs.h
index 85d0399172197a6355c1b5451eb3bb6866f908f1..d4a799e29679e486ce5afb330499bc447ca391d3 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,7 +1,8 @@
 
 
+
 /*
- * $Id: structs.h,v 1.235 1998/09/23 20:13:56 wessels Exp $
+ * $Id: structs.h,v 1.236 1998/09/29 16:33:55 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/