--------------------- PatchSet 2978 Date: 2001/09/09 08:37:34 Author: serassio Branch: nt-2_3-tolsty Tag: (none) Log: Fixed indent problems Members: acconfig.h:1.1.1.3.12.1.2.1->1.1.1.3.12.1.2.2 src/String.c:1.1.1.1.4.1.2.1.2.1->1.1.1.1.4.1.2.1.2.2 src/carp.c:1.1.1.1.4.4.2.2.2.1->1.1.1.1.4.4.2.2.2.2 src/cbdata.c:1.1.1.2.4.1.2.1.2.1->1.1.1.2.4.1.2.1.2.2 Index: squid/acconfig.h =================================================================== RCS file: /cvsroot/squid-sf//squid/Attic/acconfig.h,v retrieving revision 1.1.1.3.12.1.2.1 retrieving revision 1.1.1.3.12.1.2.2 diff -u -r1.1.1.3.12.1.2.1 -r1.1.1.3.12.1.2.2 --- squid/acconfig.h 27 Aug 2001 21:48:15 -0000 1.1.1.3.12.1.2.1 +++ squid/acconfig.h 9 Sep 2001 08:37:34 -0000 1.1.1.3.12.1.2.2 @@ -20,7 +20,8 @@ * */ @ TOP @ -/* $Id: acconfig.h,v 1.1.1.3.12.1.2.1 2001/08/27 21:48:15 tolsty Exp $ */ +/* $Id: acconfig.h,v 1.1.1.3.12.1.2.2 2001/09/09 08:37:34 serassio Exp $ */ + /********************************* * START OF CONFIGURABLE OPTIONS * *********************************/ @@ -29,19 +30,27 @@ * field blank, then define this to getfullhostname() */ #undef CACHEMGR_HOSTNAME + /* Define to do simple malloc debugging */ #undef XMALLOC_DEBUG + /* Define for log file trace of mem alloc/free */ #undef MEM_GEN_TRACE + /* Define to have malloc statistics */ #undef XMALLOC_STATISTICS + /* Define to have a detailed trace of memory allocations */ #undef XMALLOC_TRACE + #undef FORW_VIA_DB + /* Define to use async disk I/O operations */ #undef USE_ASYNC_IO + /* Defines how many threads to use for async I/O */ #undef NUMTHREADS + /* * If you want to use Squid's ICMP features (highly recommended!) then * define this. When USE_ICMP is defined, Squid will send ICMP pings @@ -53,28 +62,34 @@ * ICP_OP_MISS_NOFETCH for sites which it cannot ping. */ #undef USE_ICMP + /* * Traffic management via "delay pools". */ #undef DELAY_POOLS + /* * If you want to log User-Agent request header values, define this. * By default, they are written to useragent.log in the Squid log * directory. */ #undef USE_USERAGENT_LOG + /* * A dangerous feature which causes Squid to kill its parent process * (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. * Use with caution. */ #undef KILL_PARENT_OPT + /* Define to enable SNMP monitoring of Squid */ #undef SQUID_SNMP + /* * Define to enable WCCP */ #define USE_WCCP 1 + /* * Squid frequently calls gettimeofday() for accurate timestamping. * If you are concerned that gettimeofday() is called too often, and @@ -83,80 +98,107 @@ * intervals (one second) with ALARM signals. */ #undef ALARM_UPDATES_TIME + /* * Define this to include code which lets you specify access control * elements based on ethernet hardware addresses. This code uses * functions found in 4.4 BSD derviations (e.g. FreeBSD, ?). */ #undef USE_ARP_ACL + /* * Define this to include code for the Hypertext Cache Protocol (HTCP) */ #undef USE_HTCP + /* * Use Cache Digests for locating objects in neighbor caches. This * code is still semi-experimental. */ #undef USE_CACHE_DIGESTS + /* * Cache Array Routing Protocol */ #undef USE_CARP + /* * Define Windows NT & Windows 2000 run service mode */ #undef USE_WIN32_SERVICE + /******************************** * END OF CONFIGURABLE OPTIONS * ********************************/ + /* Define if struct tm has tm_gmtoff member */ #undef HAVE_TM_GMTOFF + /* Define if struct mallinfo has mxfast member */ #undef HAVE_EXT_MALLINFO + /* Default FD_SETSIZE value */ #undef DEFAULT_FD_SETSIZE + /* Maximum number of open filedescriptors */ #undef SQUID_MAXFD + /* UDP send buffer size */ #undef SQUID_UDP_SO_SNDBUF + /* UDP receive buffer size */ #undef SQUID_UDP_SO_RCVBUF + /* TCP send buffer size */ #undef SQUID_TCP_SO_SNDBUF + /* TCP receive buffer size */ #undef SQUID_TCP_SO_RCVBUF + /* Host type from configure */ #undef CONFIG_HOST_TYPE + /* If we need to declare sys_errlist[] as external */ #undef NEED_SYS_ERRLIST + /* If gettimeofday is known to take only one argument */ #undef GETTIMEOFDAY_NO_TZP + /* If libresolv.a has been hacked to export _dns_ttl_ */ #undef LIBRESOLV_DNS_TTL_HACK + /* Define if struct ip has ip_hl member */ #undef HAVE_IP_HL + /* Define if your compiler supports prototyping */ #undef HAVE_ANSI_PROTOTYPES + /* Define if we should use GNU regex */ #undef USE_GNUREGEX + /* signed size_t, grr */ #undef ssize_t + /* * Yay! Another Linux brokenness. Its not good enough to know that * setresuid() exists, because RedHat 5.0 declare setresuid() but * doesn't implement it. */ #undef HAVE_SETRESUID + /* Define if you have struct rusage */ #undef HAVE_STRUCT_RUSAGE + /* Define if you have PSAPI.DLL on Windows systems */ #undef HAVE_WIN32_PSAPI + /* * This makes warnings go away. If you have socklen_t defined in your * /usr/include files, then this should remain undef'd. Otherwise it * should be defined to int. */ #undef socklen_t + /* * By default (for now anyway) Squid includes options which allows * the cache administrator to violate the HTTP protocol specification @@ -164,53 +206,65 @@ * such code. */ #define HTTP_VIOLATIONS 1 + /* * Enable support for Transparent Proxy on systems using IP-Filter * address redirection. This provides "masquerading" support for non * Linux system. */ #undef IPF_TRANSPARENT + /* * Enable code for assiting in finding memory leaks. Hacker stuff only. */ #undef USE_LEAKFINDER + /* * type of fd_set array */ #undef fd_mask + /* * If _res structure has nsaddr_list member */ #undef HAVE_RES_NSADDR_LIST + /* * If _res structure has ns_list member */ #undef HAVE_RES_NS_LIST + /* * Compile in support for Ident (RFC 931) lookups? Enabled by default. */ #define USE_IDENT 1 + /* * If your system has statvfs(), and if it actually works! */ #undef HAVE_STATVFS + /* * If --disable-internal-dns was given to configure, then we'll use * the dnsserver processes instead. */ #undef USE_DNSSERVERS + /* * we check for the existance of struct mallinfo */ #undef HAVE_STRUCT_MALLINFO + /* * Do we want to use truncate(2) or unlink(2)? */ #undef USE_TRUNCATE + /* * Allow underscores in host names */ #undef ALLOW_HOSTNAME_UNDERSCORES + /* * Use the heap-based replacement techniques */ Index: squid/src/String.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/String.c,v retrieving revision 1.1.1.1.4.1.2.1.2.1 retrieving revision 1.1.1.1.4.1.2.1.2.2 diff -u -r1.1.1.1.4.1.2.1.2.1 -r1.1.1.1.4.1.2.1.2.2 --- squid/src/String.c 27 Aug 2001 21:48:19 -0000 1.1.1.1.4.1.2.1.2.1 +++ squid/src/String.c 9 Sep 2001 08:37:34 -0000 1.1.1.1.4.1.2.1.2.2 @@ -1,5 +1,6 @@ + /* - * $Id: String.c,v 1.1.1.1.4.1.2.1.2.1 2001/08/27 21:48:19 tolsty Exp $ + * $Id: String.c,v 1.1.1.1.4.1.2.1.2.2 2001/09/09 08:37:34 serassio Exp $ * * DEBUG: section 67 String * AUTHOR: Duane Wessels @@ -62,7 +63,8 @@ s->buf[len] = '\0'; } -String stringDup(const String * s) +String +stringDup(const String * s) { String dup; assert(s); Index: squid/src/carp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/carp.c,v retrieving revision 1.1.1.1.4.4.2.2.2.1 retrieving revision 1.1.1.1.4.4.2.2.2.2 diff -u -r1.1.1.1.4.4.2.2.2.1 -r1.1.1.1.4.4.2.2.2.2 --- squid/src/carp.c 27 Aug 2001 21:48:20 -0000 1.1.1.1.4.4.2.2.2.1 +++ squid/src/carp.c 9 Sep 2001 08:37:34 -0000 1.1.1.1.4.4.2.2.2.2 @@ -1,5 +1,5 @@ /* - * $Id: carp.c,v 1.1.1.1.4.4.2.2.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: carp.c,v 1.1.1.1.4.4.2.2.2.2 2001/09/09 08:37:34 serassio Exp $ * * DEBUG: section 39 Cache Array Routing Protocol * AUTHOR: Eric Stern @@ -71,8 +71,7 @@ if (!p->next) return; for (p = p->next; p; p = p->next) { - p->carp.load_multiplier = - ((K - k + 1) * (p->carp.load_factor - P_last)) / Xn; + p->carp.load_multiplier = ((K - k + 1) * (p->carp.load_factor - P_last)) / Xn; p->carp.load_multiplier += pow(X_last, K - k + 1); p->carp.load_multiplier = pow(p->carp.load_multiplier, 1 / (K - k + 1)); Xn *= p->carp.load_multiplier; Index: squid/src/cbdata.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/cbdata.c,v retrieving revision 1.1.1.2.4.1.2.1.2.1 retrieving revision 1.1.1.2.4.1.2.1.2.2 diff -u -r1.1.1.2.4.1.2.1.2.1 -r1.1.1.2.4.1.2.1.2.2 --- squid/src/cbdata.c 27 Aug 2001 21:48:20 -0000 1.1.1.2.4.1.2.1.2.1 +++ squid/src/cbdata.c 9 Sep 2001 08:37:34 -0000 1.1.1.2.4.1.2.1.2.2 @@ -1,5 +1,6 @@ + /* - * $Id: cbdata.c,v 1.1.1.2.4.1.2.1.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: cbdata.c,v 1.1.1.2.4.1.2.1.2.2 2001/09/09 08:37:34 serassio Exp $ * * DEBUG: section 45 Callback Data Registry * AUTHOR: Duane Wessels @@ -69,8 +70,7 @@ static int cbdataCount = 0; -typedef struct _cbdata -{ +typedef struct _cbdata { const void *key; struct _cbdata *next; int valid; @@ -81,8 +81,7 @@ const char *file; int line; #endif -} -cbdata; +} cbdata; static HASHCMP cbdata_cmp; static HASHHASH cbdata_hash; @@ -108,13 +107,13 @@ debug(45, 3) ("cbdataInit\n"); htable = hash_create(cbdata_cmp, 1 << 8, cbdata_hash); cachemgrRegister("cbdata", - "Callback Data Registry Contents", cbdataDump, 0, 1); + "Callback Data Registry Contents", + cbdataDump, 0, 1); } void #if CBDATA_DEBUG -cbdataAddDbg(const void *p, CBDUNL * unlock_func, int id, const char *file, - int line) +cbdataAddDbg(const void *p, CBDUNL * unlock_func, int id, const char *file, int line) #else cbdataAdd(const void *p, CBDUNL * unlock_func, int id) #endif @@ -228,10 +227,14 @@ #if CBDATA_DEBUG storeAppendPrintf(sentry, "%20p %10s %d locks %s:%d\n", c->key, - c->valid ? "VALID" : "NOT VALID", c->locks, c->file, c->line); + c->valid ? "VALID" : "NOT VALID", + c->locks, + c->file, c->line); #else storeAppendPrintf(sentry, "%20p %10s %d locks\n", - c->key, c->valid ? "VALID" : "NOT VALID", c->locks); + c->key, + c->valid ? "VALID" : "NOT VALID", + c->locks); #endif } }