From: wessels <> Date: Sun, 19 Jan 1997 15:32:09 +0000 (+0000) Subject: gindent X-Git-Tag: SQUID_3_0_PRE1~5187 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52cd89fd9cc6214f74161c0be1bf5396722480f1;p=thirdparty%2Fsquid.git gindent --- diff --git a/src/acl.cc b/src/acl.cc index bf3a0d4481..e2397965f4 100644 --- a/src/acl.cc +++ b/src/acl.cc @@ -1,5 +1,5 @@ /* - * $Id: acl.cc,v 1.75 1997/01/14 19:50:05 wessels Exp $ + * $Id: acl.cc,v 1.76 1997/01/19 08:32:09 wessels Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -501,16 +501,15 @@ aclParseAclLine(void) debug(28, 0, "aclParseAclLine: Invalid ACL type '%s'\n", t); return; } - if ((A = aclFindByName(t)) == NULL) { - A = xcalloc(1, sizeof(struct _acl)); + A = xcalloc(1, sizeof(struct _acl)); xstrncpy(A->name, aclname, ACL_NAME_SZ); A->type = acltype; - A->cfgline = xstrdup(config_input_line); - *AclListTail = A; - AclListTail = &A->next; + A->cfgline = xstrdup(config_input_line); + *AclListTail = A; + AclListTail = &A->next; } else { - if (acltype != A->type) { + if (acltype != A->type) { debug(28, 0, "aclParseAclLine: ACL '%s' already exists with different type, skipping.\n", A->name); return; } diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 553dceb3c6..1864bf5a46 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -1,5 +1,5 @@ /* - * $Id: cache_cf.cc,v 1.164 1997/01/14 19:50:07 wessels Exp $ + * $Id: cache_cf.cc,v 1.165 1997/01/19 08:32:10 wessels Exp $ * * DEBUG: section 3 Configuration File Parsing * AUTHOR: Harvest Derived @@ -1161,9 +1161,9 @@ parseConfigFile(const char *file_name) else if (!strcmp(token, "cache_stoplist")) parseWordlist(&Config.cache_stoplist); else if (!strcmp(token, "cache_stoplist_pattern")) - aclParseRegexList(&Config.cache_stop_relist, 0); + aclParseRegexList(&Config.cache_stop_relist, 0); else if (!strcmp(token, "cache_stoplist_pattern/i")) - aclParseRegexList(&Config.cache_stop_relist, 1); + aclParseRegexList(&Config.cache_stop_relist, 1); #if DELAY_HACK else if (!strcmp(token, "delay_access")) diff --git a/src/ipcache.cc b/src/ipcache.cc index f9e5228c3b..bfc19666c0 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -1,5 +1,5 @@ /* - * $Id: ipcache.cc,v 1.96 1997/01/18 06:04:02 wessels Exp $ + * $Id: ipcache.cc,v 1.97 1997/01/19 08:32:12 wessels Exp $ * * DEBUG: section 14 IP Cache * AUTHOR: Harvest Derived @@ -687,7 +687,7 @@ ipcache_nbgethostbyname(const char *name, int fd, IPH handler, void *handlerData IpcacheStats.pending_hits++; ipcacheAddPending(i, fd, handler, handlerData); if (squid_curtime - i->expires > 60) { - 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, squid_curtime + Config.negativeDnsTtl - i->expires); ipcache_call_pending(i); ipcacheChangeKey(i); } diff --git a/src/stat.cc b/src/stat.cc index 7de942157a..9761d433b7 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -1,6 +1,6 @@ /* - * $Id: stat.cc,v 1.120 1997/01/19 08:16:14 wessels Exp $ + * $Id: stat.cc,v 1.121 1997/01/19 08:32:13 wessels Exp $ * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived @@ -762,7 +762,7 @@ info_get(const cacheinfo * obj, StoreEntry * sentry) storeAppendPrintf(sentry, "{\tStorage Mem size:\t%d KB}\n", store_mem_size >> 10); storeAppendPrintf(sentry, "{\tStorage LRU Expiration Age:\t%6.2f days}\n", - (double) storeExpiredReferenceAge() / 86400.0); + (double) storeExpiredReferenceAge() / 86400.0); #if HAVE_GETRUSAGE && defined(RUSAGE_SELF) storeAppendPrintf(sentry, "{Resource usage for %s:}\n", appname); diff --git a/src/store.cc b/src/store.cc index 16c9531c5c..6eec886ad7 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.195 1997/01/19 08:10:52 wessels Exp $ + * $Id: store.cc,v 1.196 1997/01/19 08:32:14 wessels Exp $ * * DEBUG: section 20 Storeage Manager * AUTHOR: Harvest Derived @@ -2793,7 +2793,7 @@ storeExpiredReferenceAge(void) x = -1.0; else if (x > 1.0) x = 1.0; - z = pow(724.0,(x + 1.0)); /* minutes [1:525600] */ + z = pow(724.0, (x + 1.0)); /* minutes [1:525600] */ age = (time_t) (z * 60.0); if (age < 60) age = 60;