# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: henrik@henriknordstrom.net-20080316221018-\ # 2hfl3gyac1hgbvnd # target_branch: file:///data/bzr/squid3/trunk/ # testament_sha1: f371eb1cf441451f45b6a37b471eef4584235750 # timestamp: 2008-03-16 23:13:28 +0100 # base_revision_id: henrik@henriknordstrom.net-20080316012056-\ # zqeoxaja7x3wbp6l # # Begin patch === modified file 'include/List.h' --- include/List.h 2008-02-27 04:49:32 +0000 +++ include/List.h 2008-03-16 21:48:45 +0000 @@ -187,9 +187,7 @@ if (head) { List *tempNode = NULL; - for (tempNode = head; tempNode->next; tempNode = tempNode->next) - - ; + for (tempNode = head; tempNode->next; tempNode = tempNode->next); tempNode->next = node; } else head = node; === modified file 'include/radix.h' --- include/radix.h 2003-10-20 18:33:01 +0000 +++ include/radix.h 2008-03-16 22:10:18 +0000 @@ -65,9 +65,7 @@ char *rn_Mask; /* netmask, if present */ struct squid_radix_node *rn_Dupedkey; - } - - rn_leaf; + } rn_leaf; struct { /* node only data: */ int rn_Off; /* where to start compare */ @@ -75,9 +73,7 @@ struct squid_radix_node *rn_L; /* progeny */ struct squid_radix_node *rn_R; /* progeny */ - } - - rn_node; + } rn_node; } rn_u; #ifdef RN_DEBUG === modified file 'src/ACLBrowser.cc' --- src/ACLBrowser.cc 2004-12-20 23:30:12 +0000 +++ src/ACLBrowser.cc 2008-03-16 21:48:45 +0000 @@ -41,12 +41,8 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; -template class ACLRequestHeaderStrategy - -; +template class ACLStrategised; +template class ACLRequestHeaderStrategy; ACL::Prototype ACLBrowser::RegistryProtoype(&ACLBrowser::RegistryEntry_, "browser"); === modified file 'src/ACLMaxUserIP.h' --- src/ACLMaxUserIP.h 2008-02-27 04:49:32 +0000 +++ src/ACLMaxUserIP.h 2008-03-16 21:48:45 +0000 @@ -75,11 +75,8 @@ { Flags() : strict(0){} -unsigned int strict: - 1; - } - - flags; + unsigned int strict:1; + } flags; }; MEMPROXY_CLASS_INLINE(ACLMaxUserIP) /**DOCS_NOSEMI*/ === modified file 'src/ACLMethod.cc' --- src/ACLMethod.cc 2008-01-20 15:54:28 +0000 +++ src/ACLMethod.cc 2008-03-16 21:48:45 +0000 @@ -41,9 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; +template class ACLStrategised; ACL::Prototype ACLMethod::RegistryProtoype(&ACLMethod::RegistryEntry_, "method"); === modified file 'src/ACLMethodData.cc' --- src/ACLMethodData.cc 2008-02-27 04:49:32 +0000 +++ src/ACLMethodData.cc 2008-03-16 21:48:45 +0000 @@ -88,9 +88,7 @@ List **Tail; char *t = NULL; - for (Tail = &values; *Tail; Tail = &((*Tail)->next)) - - ; + for (Tail = &values; *Tail; Tail = &((*Tail)->next)); while ((t = strtokFile())) { List *q = new List (HttpRequestMethod(t, NULL)); *(Tail) = q; === modified file 'src/ACLMyPort.cc' --- src/ACLMyPort.cc 2007-12-15 06:11:41 +0000 +++ src/ACLMyPort.cc 2008-03-16 21:48:45 +0000 @@ -40,9 +40,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; +template class ACLStrategised; ACL::Prototype ACLMyPort::RegistryProtoype(&ACLMyPort::RegistryEntry_, "myport"); === modified file 'src/ACLProtocol.cc' --- src/ACLProtocol.cc 2003-10-20 18:33:01 +0000 +++ src/ACLProtocol.cc 2008-03-16 21:48:45 +0000 @@ -41,9 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; +template class ACLStrategised; ACL::Prototype ACLProtocol::RegistryProtoype(&ACLProtocol::RegistryEntry_, "proto"); @@ -53,7 +51,6 @@ ACLProtocolStrategy::match (ACLData * &data, ACLChecklist *checklist) { return data->match (checklist->request->protocol); - ; } ACLProtocolStrategy * === modified file 'src/ACLProtocolData.cc' --- src/ACLProtocolData.cc 2008-02-27 04:49:32 +0000 +++ src/ACLProtocolData.cc 2008-03-16 21:48:45 +0000 @@ -86,9 +86,7 @@ List **Tail; char *t = NULL; - for (Tail = &values; *Tail; Tail = &((*Tail)->next)) - - ; + for (Tail = &values; *Tail; Tail = &((*Tail)->next)); while ((t = strtokFile())) { List *q = new List (urlParseProtocol(t)); *(Tail) = q; === modified file 'src/ACLReferer.cc' --- src/ACLReferer.cc 2003-10-20 18:33:01 +0000 +++ src/ACLReferer.cc 2008-03-16 21:48:45 +0000 @@ -41,9 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLRequestHeaderStrategy - -; +template class ACLRequestHeaderStrategy; ACL::Prototype ACLReferer::RegistryProtoype(&ACLReferer::RegistryEntry_, "referer_regex"); === modified file 'src/ACLRegexData.cc' --- src/ACLRegexData.cc 2007-04-29 04:26:37 +0000 +++ src/ACLRegexData.cc 2008-03-16 21:48:45 +0000 @@ -125,9 +125,7 @@ int errcode; int flags = REG_EXTENDED | REG_NOSUB; - for (Tail = (relist **)curlist; *Tail; Tail = &((*Tail)->next)) - - ; + for (Tail = (relist **)curlist; *Tail; Tail = &((*Tail)->next)); while ((t = ConfigParser::strtokFile())) { if (strcmp(t, "-i") == 0) { flags |= REG_ICASE; === modified file 'src/ACLReplyMIMEType.cc' --- src/ACLReplyMIMEType.cc 2003-10-20 18:33:01 +0000 +++ src/ACLReplyMIMEType.cc 2008-03-16 21:48:45 +0000 @@ -41,9 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLReplyHeaderStrategy - -; +template class ACLReplyHeaderStrategy; ACL::Prototype ACLReplyMIMEType::RegistryProtoype(&ACLReplyMIMEType::RegistryEntry_, "rep_mime_type"); === modified file 'src/ACLRequestMIMEType.cc' --- src/ACLRequestMIMEType.cc 2003-10-20 18:33:01 +0000 +++ src/ACLRequestMIMEType.cc 2008-03-16 21:48:45 +0000 @@ -41,9 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLRequestHeaderStrategy - -; +template class ACLRequestHeaderStrategy; ACL::Prototype ACLRequestMIMEType::RegistryProtoype(&ACLRequestMIMEType::RegistryEntry_, "req_mime_type"); === modified file 'src/ACLSslError.cc' --- src/ACLSslError.cc 2008-02-12 05:24:38 +0000 +++ src/ACLSslError.cc 2008-03-16 21:48:45 +0000 @@ -10,9 +10,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; +template class ACLStrategised; ACL::Prototype ACLSslError::RegistryProtoype(&ACLSslError::RegistryEntry_, "ssl_error"); === modified file 'src/ACLSslErrorData.cc' --- src/ACLSslErrorData.cc 2008-02-12 05:24:38 +0000 +++ src/ACLSslErrorData.cc 2008-03-16 21:48:45 +0000 @@ -51,9 +51,7 @@ List **Tail; char *t = NULL; - for (Tail = &values; *Tail; Tail = &((*Tail)->next)) - - ; + for (Tail = &values; *Tail; Tail = &((*Tail)->next)); while ((t = strtokFile())) { List *q = new List(sslParseErrorString(t)); *(Tail) = q; === modified file 'src/ACLStrategised.cc' --- src/ACLStrategised.cc 2008-02-06 11:05:38 +0000 +++ src/ACLStrategised.cc 2008-03-16 21:48:45 +0000 @@ -49,6 +49,4 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; +template class ACLStrategised; === modified file 'src/ACLStrategy.h' --- src/ACLStrategy.h 2005-05-08 12:36:45 +0000 +++ src/ACLStrategy.h 2008-03-16 21:48:45 +0000 @@ -54,8 +54,7 @@ virtual bool valid() const {return true;} - virtual ~ACLStrategy(){}} - -; + virtual ~ACLStrategy(){} +}; #endif /* SQUID_ACLSTRATEGY_H */ === modified file 'src/ACLTimeData.cc' --- src/ACLTimeData.cc 2007-04-30 22:56:09 +0000 +++ src/ACLTimeData.cc 2008-03-16 21:48:45 +0000 @@ -129,9 +129,7 @@ ACLTimeData **Tail; long weekbits = 0; - for (Tail = &next; *Tail; Tail = &((*Tail)->next)) - - ; + for (Tail = &next; *Tail; Tail = &((*Tail)->next)); ACLTimeData *q = NULL; int h1, m1, h2, m2; === modified file 'src/ACLUserData.h' --- src/ACLUserData.h 2008-02-27 04:49:32 +0000 +++ src/ACLUserData.h 2008-03-16 21:48:45 +0000 @@ -56,15 +56,9 @@ struct { - -unsigned int case_insensitive: - 1; - -unsigned int required: - 1; - } - - flags; + unsigned int case_insensitive:1; + unsigned int required:1; + } flags; }; MEMPROXY_CLASS_INLINE(ACLUserData) /**DOCS_NOSEMI*/ === modified file 'src/AccessLogEntry.h' --- src/AccessLogEntry.h 2008-02-26 07:15:48 +0000 +++ src/AccessLogEntry.h 2008-03-16 22:10:18 +0000 @@ -62,9 +62,7 @@ int code; const char *content_type; HttpVersion version; - } - - http; + } http; class ICPDetails { @@ -73,9 +71,7 @@ ICPDetails() : opcode(ICP_INVALID) {} icp_opcode opcode; - } - - icp; + } icp; class CacheDetails { @@ -93,8 +89,7 @@ #if USE_SSL ,ssluser(NULL) #endif - { - ; + {; } IPAddress caddr; @@ -111,9 +106,7 @@ const char *ssluser; #endif - } - - cache; + } cache; class Headers { @@ -123,9 +116,7 @@ char *request; char *reply; - } - - headers; + } headers; class Private { @@ -134,9 +125,7 @@ Private() : method_str(NULL) {} const char *method_str; - } - - _private; + } _private; HierarchyLogEntry hier; HttpReply *reply; HttpRequest *request; === modified file 'src/AuthUser.cci' --- src/AuthUser.cci 2007-05-09 21:26:12 +0000 +++ src/AuthUser.cci 2008-03-16 21:48:45 +0000 @@ -52,9 +52,7 @@ { /* lock for the request link */ - lock() - - ; + lock(); dlink_node *node = dlinkNodeNew(); dlinkAdd(request, node, &requests); === modified file 'src/AuthUser.h' --- src/AuthUser.h 2008-02-27 04:49:32 +0000 +++ src/AuthUser.h 2008-03-16 21:48:45 +0000 @@ -84,9 +84,7 @@ void addIp(IPAddress); _SQUID_INLINE_ void addRequest(AuthUserRequest *); - void lock() - - ; + void lock(); void unlock(); void addToNameCache(); === modified file 'src/CacheDigest.cc' --- src/CacheDigest.cc 2007-11-15 23:47:31 +0000 +++ src/CacheDigest.cc 2008-03-16 22:10:18 +0000 @@ -46,9 +46,7 @@ int bit_on_count; /* #bits turned on */ int bseq_len_sum; /* sum of all bit seq length */ int bseq_count; /* number of bit seqs */ -} - -CacheDigestStats; +} CacheDigestStats; /* local functions */ static void cacheDigestHashKey(const CacheDigest * cd, const cache_key * key); === modified file 'src/CacheManager.h' --- src/CacheManager.h 2008-02-27 04:49:32 +0000 +++ src/CacheManager.h 2008-03-16 21:48:45 +0000 @@ -58,15 +58,9 @@ struct { - -unsigned int pw_req: - 1; - -unsigned int atomic: - 1; - } - - flags; + unsigned int pw_req:1; + unsigned int atomic:1; + } flags; CacheManagerAction *next; }; === modified file 'src/DelayUser.cc' --- src/DelayUser.cc 2007-04-29 04:26:37 +0000 +++ src/DelayUser.cc 2008-03-16 21:48:45 +0000 @@ -186,9 +186,7 @@ { debugs(77, 3, "DelayUserBucket::DelayUserBucket"); - authUser->lock() - - ; + authUser->lock(); } DelayUserBucket::~DelayUserBucket() === modified file 'src/DiskIO/DiskDaemon/DiskdFile.cc' --- src/DiskIO/DiskDaemon/DiskdFile.cc 2008-02-27 04:49:32 +0000 +++ src/DiskIO/DiskDaemon/DiskdFile.cc 2008-03-16 21:48:45 +0000 @@ -328,8 +328,7 @@ aRequest); if (x < 0) { - ioCompleted() - ; + ioCompleted(); errorOccured = true; debugs(79, 1, "storeDiskdSend WRITE: " << xstrerror()); // IO->shm.put (shm_offset); === modified file 'src/DiskIO/DiskThreads/aiops.cc' --- src/DiskIO/DiskThreads/aiops.cc 2007-08-17 05:32:28 +0000 +++ src/DiskIO/DiskThreads/aiops.cc 2008-03-16 22:10:18 +0000 @@ -86,9 +86,7 @@ struct stat *statp; squidaio_result_t *resultp; -} - -squidaio_request_t; +} squidaio_request_t; typedef struct squidaio_request_queue_t { @@ -98,9 +96,7 @@ squidaio_request_t *volatile *volatile tailp; unsigned long requests; unsigned long blocked; /* main failed to lock the queue */ -} - -squidaio_request_queue_t; +} squidaio_request_queue_t; typedef struct squidaio_thread_t squidaio_thread_t; === modified file 'src/DiskIO/DiskThreads/aiops_win32.cc' --- src/DiskIO/DiskThreads/aiops_win32.cc 2007-08-17 05:32:28 +0000 +++ src/DiskIO/DiskThreads/aiops_win32.cc 2008-03-16 22:10:18 +0000 @@ -82,9 +82,7 @@ struct stat *statp; squidaio_result_t *resultp; -} - -squidaio_request_t; +} squidaio_request_t; typedef struct squidaio_request_queue_t { @@ -94,9 +92,7 @@ squidaio_request_t *volatile *volatile tailp; unsigned long requests; unsigned long blocked; /* main failed to lock the queue */ -} - -squidaio_request_queue_t; +} squidaio_request_queue_t; typedef struct squidaio_thread_t squidaio_thread_t; === modified file 'src/DiskIO/DiskThreads/async_io.cc' --- src/DiskIO/DiskThreads/async_io.cc 2007-08-17 05:32:28 +0000 +++ src/DiskIO/DiskThreads/async_io.cc 2008-03-16 22:10:18 +0000 @@ -48,9 +48,7 @@ char *path; struct squidaio_unlinkq_t *next; -} - -squidaio_unlinkq_t; +} squidaio_unlinkq_t; dlink_list used_list; === modified file 'src/ESI.cc' --- src/ESI.cc 2008-02-27 04:49:32 +0000 +++ src/ESI.cc 2008-03-16 22:10:18 +0000 @@ -170,21 +170,11 @@ struct { - -int attemptok: - 1; /* the attempt branch process correctly */ - -int exceptok: - 1; /* likewise */ - -int attemptfailed: - 1; /* The attempt branch failed */ - -int exceptfailed: - 1; /* the except branch failed */ - } - - flags; + int attemptok:1; /* the attempt branch process correctly */ + int exceptok:1; /* likewise */ + int attemptfailed:1; /* The attempt branch failed */ + int exceptfailed:1; /* the except branch failed */ + } flags; void finish(); private: @@ -264,9 +254,8 @@ { // void *operator new (size_t byteCount); // void operator delete (void *address); - esiOtherwise(esiTreeParentPtr aParent) : esiSequence (aParent) {}} - -; + esiOtherwise(esiTreeParentPtr aParent) : esiSequence (aParent) {} +}; CBDATA_CLASS_INIT(ESIContext); === modified file 'src/ESIAttempt.h' --- src/ESIAttempt.h 2003-08-05 04:14:37 +0000 +++ src/ESIAttempt.h 2008-03-16 21:48:45 +0000 @@ -46,9 +46,7 @@ { // void *operator new (size_t byteCount); // void operator delete (void *address); - esiAttempt(esiTreeParentPtr aParent) : esiSequence (aParent) {}} - -; - + esiAttempt(esiTreeParentPtr aParent) : esiSequence (aParent) {} +}; #endif /* SQUID_ESIATTEMPT_H */ === modified file 'src/ESIContext.h' --- src/ESIContext.h 2008-01-08 00:10:22 +0000 +++ src/ESIContext.h 2008-03-16 21:48:45 +0000 @@ -85,38 +85,22 @@ struct { - -int passthrough: - 1; - -int oktosend: - 1; - -int finished: - 1; + int passthrough:1; + int oktosend:1; + int finished:1; /* an error has occured, send full body replies * regardless. Note that we don't fail midstream * because we buffer until we can not fail */ - -int error: - 1; - -int finishedtemplate: - 1; /* we've read the entire template */ - -int clientwantsdata: - 1; /* we need to satisfy a read request */ - -int kicked: - 1; /* note on reentering the kick routine */ - -int detached: - 1; /* our downstream has detached */ - } - - flags; + int error:1; + + int finishedtemplate:1; /* we've read the entire template */ + int clientwantsdata:1; /* we need to satisfy a read request */ + int kicked:1; /* note on reentering the kick routine */ + int detached:1; /* our downstream has detached */ + } flags; + err_type errorpage; /* if we error what page to use */ http_status errorstatus; /* if we error, what code to return */ char *errormessage; /* error to pass to error page */ @@ -149,9 +133,7 @@ ParserState(); void freeResources(); void popAll(); - - int parsing: - 1; /* libexpat is not reentrant on the same context */ + int parsing:1; /* libexpat is not reentrant on the same context */ private: bool inited_; === modified file 'src/ESIElement.h' --- src/ESIElement.h 2003-08-05 04:14:37 +0000 +++ src/ESIElement.h 2008-03-16 21:48:45 +0000 @@ -55,9 +55,8 @@ virtual void fail(ESIElement * source, char const *reason = NULL) {} - virtual ~esiTreeParent(){}} - -; + virtual ~esiTreeParent(){} +}; typedef RefCount esiTreeParentPtr; === modified file 'src/ESIExcept.h' --- src/ESIExcept.h 2003-08-05 04:14:37 +0000 +++ src/ESIExcept.h 2008-03-16 21:48:45 +0000 @@ -48,8 +48,7 @@ public: // void *operator new (size_t byteCount); // void operator delete (void *address); - esiExcept(esiTreeParentPtr aParent) : esiSequence (aParent) {}} - -; + esiExcept(esiTreeParentPtr aParent) : esiSequence (aParent) {} +}; #endif /* SQUID_ESIEXCEPT_H */ === modified file 'src/ESIExpression.cc' --- src/ESIExpression.cc 2007-04-29 04:26:37 +0000 +++ src/ESIExpression.cc 2008-03-16 22:10:18 +0000 @@ -73,8 +73,7 @@ ESI_EXPR_MORE, ESI_EXPR_MOREEQ, ESI_EXPR_EXPR /* the result of an expr PRI 1 */ -} -evaltype; +} evaltype; typedef enum { @@ -83,8 +82,7 @@ ESI_LITERAL_INT, ESI_LITERAL_BOOL, ESI_LITERAL_INVALID -} -literalhint; +} literalhint; struct _stackmember { @@ -94,8 +92,7 @@ char *string; double floating; int integral; - } - value; + } value; literalhint valuestored; evaltype valuetype; int precedence; === modified file 'src/ESIInclude.h' --- src/ESIInclude.h 2008-02-27 04:49:32 +0000 +++ src/ESIInclude.h 2008-03-16 21:48:45 +0000 @@ -81,18 +81,10 @@ struct { - -int onerrorcontinue: - 1; /* on error return zero data */ - -int failed: - 1; /* Failed to process completely */ - -int finished: - 1; /* Finished getting subrequest data */ - } - - flags; + int onerrorcontinue:1; /* on error return zero data */ + int failed:1; /* Failed to process completely */ + int finished:1; /* Finished getting subrequest data */ + } flags; ESIStreamContext::Pointer src; ESIStreamContext::Pointer alt; ESISegment::Pointer srccontent; === modified file 'src/ESILiteral.h' --- src/ESILiteral.h 2008-02-27 04:49:32 +0000 +++ src/ESILiteral.h 2008-03-16 21:48:45 +0000 @@ -59,12 +59,9 @@ struct { - -int donevars: - 1; - } - - flags; + int donevars:1; + } flags; + ESIVarState *varState; void finish(); === modified file 'src/ESISequence.h' --- src/ESISequence.h 2008-02-27 04:49:32 +0000 +++ src/ESISequence.h 2008-03-16 21:48:45 +0000 @@ -68,12 +68,8 @@ struct { - -int dovars: - 1; /* for esiVar */ - } - - flags; + int dovars:1; /* for esiVar */ + } flags; void finish(); protected: === modified file 'src/ESIVarState.h' --- src/ESIVarState.h 2007-05-29 19:31:36 +0000 +++ src/ESIVarState.h 2008-03-16 21:48:45 +0000 @@ -88,24 +88,12 @@ struct { - -int language: - 1; - -int cookie: - 1; - -int host: - 1; - -int referer: - 1; - -int useragent: - 1; - } - - flags; + int language:1; + int cookie:1; + int host:1; + int referer:1; + int useragent:1; + } flags; public: === modified file 'src/EventLoop.cc' --- src/EventLoop.cc 2008-02-13 06:49:44 +0000 +++ src/EventLoop.cc 2008-03-16 21:48:45 +0000 @@ -92,9 +92,7 @@ { prepareToRun(); - while (!runOnce()) - - ; + while (!runOnce()); } bool === modified file 'src/HttpHdrContRange.h' --- src/HttpHdrContRange.h 2007-08-13 23:20:50 +0000 +++ src/HttpHdrContRange.h 2008-03-16 21:48:45 +0000 @@ -56,7 +56,6 @@ SQUIDCEXTERN void httpHdrContRangePackInto(const HttpHdrContRange * crange, Packer * p); /* inits with given spec */ SQUIDCEXTERN void httpHdrContRangeSet(HttpHdrContRange *, HttpHdrRangeSpec, int64_t); -; SQUIDCEXTERN void httpHeaderAddContRange(HttpHeader *, HttpHdrRangeSpec, int64_t); === modified file 'src/HttpHeaderTools.cc' --- src/HttpHeaderTools.cc 2007-09-28 06:22:37 +0000 +++ src/HttpHeaderTools.cc 2008-03-16 21:48:45 +0000 @@ -248,7 +248,7 @@ size_t len; static char delim[2][3] = { { '"', '?', 0}, - { '"', '\\', 0}}; + { '"', '\\', 0} }; int quoted = 0; assert(str && item && pos); === modified file 'src/ICAP/ICAPModXact.h' --- src/ICAP/ICAPModXact.h 2008-02-13 06:12:45 +0000 +++ src/ICAP/ICAPModXact.h 2008-03-16 22:10:18 +0000 @@ -300,9 +300,7 @@ enum Sending { sendingUndecided, sendingVirgin, sendingAdapted, sendingDone } sending; - } - - state; + } state; CBDATA_CLASS2(ICAPModXact); }; === modified file 'src/ICMPv4.cc' --- src/ICMPv4.cc 2007-12-28 19:04:45 +0000 +++ src/ICMPv4.cc 2008-03-16 21:48:45 +0000 @@ -65,8 +65,7 @@ }; ICMPv4::ICMPv4() : ICMP() -{ - ; +{; } ICMPv4::~ICMPv4() === modified file 'src/ICMPv4.h' --- src/ICMPv4.h 2007-12-15 06:11:41 +0000 +++ src/ICMPv4.h 2008-03-16 22:10:18 +0000 @@ -112,8 +112,7 @@ u_int16_t checksum; /* IP checksum */ u_int32_t source_ip; u_int32_t dest_ip; -} -iphdr; +} iphdr; /* ICMP header */ typedef struct icmphdr @@ -124,8 +123,7 @@ u_int16_t icmp_id; u_int16_t icmp_seq; u_int32_t timestamp; /* not part of ICMP, but we need it */ -} -icmphdr; +} icmphdr; #endif /* _SQUID_MSWIN_ */ === modified file 'src/MemBuf.h' --- src/MemBuf.h 2008-02-27 04:49:32 +0000 +++ src/MemBuf.h 2008-03-16 21:48:45 +0000 @@ -171,13 +171,11 @@ */ mb_size_t capacity; -unsigned stolen: - 1; /* the buffer has been stolen for use by someone else */ + unsigned stolen:1; /* the buffer has been stolen for use by someone else */ #if 0 -unsigned valid: - 1; /* to be used for debugging only! */ + unsigned valid:1; /* to be used for debugging only! */ #endif }; === modified file 'src/MemObject.h' --- src/MemObject.h 2008-02-27 04:49:32 +0000 +++ src/MemObject.h 2008-03-16 22:10:18 +0000 @@ -126,9 +126,7 @@ { STABH *callback; void *data; - } - - abort; + } abort; char *log_url; RemovalPolicyNode repl; int id; === modified file 'src/NullDelayId.h' --- src/NullDelayId.h 2003-08-05 04:14:37 +0000 +++ src/NullDelayId.h 2008-03-16 21:48:45 +0000 @@ -54,8 +54,7 @@ void operator delete (void *); virtual int bytesWanted (int minimum, int maximum) const {return max(minimum,maximum);} - virtual void bytesIn(int qty) {}} - -; + virtual void bytesIn(int qty) {} +}; #endif #endif /* NULLDELAYID_H */ === modified file 'src/PeerDigest.h' --- src/PeerDigest.h 2007-09-21 17:41:52 +0000 +++ src/PeerDigest.h 2008-03-16 21:48:45 +0000 @@ -103,17 +103,10 @@ struct { -unsigned int needed: - 1; /* there were requests for this digest */ - -unsigned int usable: - 1; /* can be used for lookups */ - -unsigned int requested: - 1; /* in process of receiving [fresh] digest */ - } - - flags; + unsigned int needed:1; /* there were requests for this digest */ + unsigned int usable:1; /* can be used for lookups */ + unsigned int requested:1; /* in process of receiving [fresh] digest */ + } flags; struct { @@ -126,9 +119,7 @@ time_t req_delay; /* last request response time */ time_t received; /* received the current copy of a digest */ time_t disabled; /* disabled for good */ - } - - times; + } times; struct { @@ -139,12 +130,8 @@ { int msgs; kb_t kbytes; - } - - sent, recv; - } - - stats; + } sent, recv; + } stats; private: CBDATA_CLASS(PeerDigest); === modified file 'src/ProtoPort.h' --- src/ProtoPort.h 2008-02-12 05:24:38 +0000 +++ src/ProtoPort.h 2008-03-16 21:48:45 +0000 @@ -21,23 +21,18 @@ char *name; /* visible name */ char *defaultsite; /* default web site */ -unsigned int transparent: - 1; /* transparent proxy */ - -unsigned int accel: - 1; /* HTTP accelerator */ - -unsigned int vhost: - 1; /* uses host header */ - -unsigned int sslBump: - 1; /* intercepts CONNECT requests */ + unsigned int transparent:1; /* transparent proxy */ + + unsigned int accel:1; /* HTTP accelerator */ + + unsigned int vhost:1; /* uses host header */ + + unsigned int sslBump:1; /* intercepts CONNECT requests */ int vport; /* virtual port support, -1 for dynamic, >0 static*/ int disable_pmtu_discovery; #if LINUX_TPROXY -unsigned int tproxy: - 1; /* spoof client ip using tproxy */ + unsigned int tproxy:1; /* spoof client ip using tproxy */ #endif struct { === modified file 'src/StoreClient.h' --- src/StoreClient.h 2007-08-13 23:20:50 +0000 +++ src/StoreClient.h 2008-03-16 22:10:18 +0000 @@ -84,18 +84,10 @@ struct { - -unsigned int disk_io_pending: - 1; - -unsigned int store_copying: - 1; - -unsigned int copy_event_pending: - 1; - } - - flags; + unsigned int disk_io_pending:1; + unsigned int store_copying:1; + unsigned int copy_event_pending:1; + } flags; #if DELAY_POOLS DelayId delayId; @@ -130,9 +122,7 @@ bool pending() const; STCB *callback_handler; void *callback_data; - } - - _callback; + } _callback; }; SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *); === modified file 'src/StoreHashIndex.h' --- src/StoreHashIndex.h 2007-08-13 23:20:50 +0000 +++ src/StoreHashIndex.h 2008-03-16 21:48:45 +0000 @@ -85,9 +85,7 @@ }; class StoreHashIndexEntry : public StoreEntry -{} - -; +{}; class StoreSearchHashIndex : public StoreSearch { === modified file 'src/StoreIOBuffer.h' --- src/StoreIOBuffer.h 2007-08-13 23:20:50 +0000 +++ src/StoreIOBuffer.h 2008-03-16 21:48:45 +0000 @@ -74,12 +74,8 @@ struct { - -unsigned error: - 1; - } - - flags; + unsigned error:1; + } flags; size_t length; int64_t offset; char *data; === modified file 'src/StoreIOState.h' --- src/StoreIOState.h 2006-08-21 06:50:40 +0000 +++ src/StoreIOState.h 2008-03-16 22:10:18 +0000 @@ -99,18 +99,12 @@ { STRCB *callback; void *callback_data; - } - - read; + } read; struct { - -unsigned int closing: - 1; /* debugging aid */ - } - - flags; + unsigned int closing:1; /* debugging aid */ + } flags; }; StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *); === modified file 'src/SwapDir.h' --- src/SwapDir.h 2007-09-28 06:22:37 +0000 +++ src/SwapDir.h 2008-03-16 22:10:18 +0000 @@ -172,15 +172,9 @@ struct Flags { Flags() : selected(0), read_only(0){} - -unsigned int selected: - 1; - -unsigned int read_only: - 1; - } - - flags; + unsigned int selected:1; + unsigned int read_only:1; + } flags; virtual void init() = 0; /* Initialise the fs */ virtual void create(); /* Create a new fs */ virtual void dump(StoreEntry &)const; /* Dump fs config snippet */ @@ -220,9 +214,7 @@ struct { int blksize; - } - - fs; + } fs; }; #endif /* SQUID_SWAPDIR_H */ === modified file 'src/access_log.cc' --- src/access_log.cc 2008-01-20 15:54:28 +0000 +++ src/access_log.cc 2008-03-16 22:10:18 +0000 @@ -96,9 +96,7 @@ { hash_link hash; int n; -} - -fvdb_entry; +} fvdb_entry; static hash_table *via_table = NULL; static hash_table *forw_table = NULL; static void fvdbInit(); @@ -406,24 +404,15 @@ char *header; char *element; char separator; - } - - header; + } header; char *timespec; } data; unsigned char width; unsigned char precision; - enum log_quote quote; - -unsigned int left: - 1; - -unsigned int space: - 1; - -unsigned int zero: - 1; + unsigned int left:1; + unsigned int space:1; + unsigned int zero:1; int divisor; logformat_token *next; /* todo: move from linked list to array */ }; === modified file 'src/acl_noncore.cc' --- src/acl_noncore.cc 2007-09-01 11:56:37 +0000 +++ src/acl_noncore.cc 2008-03-16 21:48:45 +0000 @@ -192,9 +192,7 @@ A->cfgline = xstrdup(config_input_line); /* Append to the end of this list */ - for (B = *head, T = head; B; T = &B->next, B = B->next) - - ; + for (B = *head, T = head; B; T = &B->next, B = B->next); *T = A; /* We lock _acl_access structures in ACLChecklist::check() */ === modified file 'src/asn.cc' --- src/asn.cc 2008-02-27 04:49:32 +0000 +++ src/asn.cc 2008-03-16 21:48:45 +0000 @@ -243,9 +243,7 @@ FwdState::fwdStart(-1, e, asState->request); } else { - e->lock() - - ; + e->lock(); asState->sc = storeClientListAdd(e, asState); } @@ -440,8 +438,7 @@ } else { debugs(53, 3, "asnAddNet: Warning: Found a network with multiple AS numbers!"); - for (Tail = &asinfo->as_number; *Tail; Tail = &(*Tail)->next) - ; + for (Tail = &asinfo->as_number; *Tail; Tail = &(*Tail)->next); q = new List (as_number); *(Tail) = q; @@ -579,9 +576,7 @@ List *q = NULL; char *t = NULL; - for (Tail = curlist; *Tail; Tail = &((*Tail)->next)) - - ; + for (Tail = curlist; *Tail; Tail = &((*Tail)->next)); while ((t = strtokFile())) { q = new List (atoi(t)); *(Tail) = q; @@ -600,9 +595,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; +template class ACLStrategised; ACL::Prototype ACLASN::SourceRegistryProtoype(&ACLASN::SourceRegistryEntry_, "src_as"); === modified file 'src/auth/basic/auth_basic.h' --- src/auth/basic/auth_basic.h 2008-02-27 04:49:32 +0000 +++ src/auth/basic/auth_basic.h 2008-03-16 22:10:18 +0000 @@ -65,9 +65,7 @@ unsigned int credentials_ok: 2; /*0=unchecked,1=ok,2=failed */ - } - - flags; + } flags; BasicAuthQueueNode *auth_queue; private: === modified file 'src/auth/digest/auth_digest.cc' --- src/auth/digest/auth_digest.cc 2008-02-13 06:17:50 +0000 +++ src/auth/digest/auth_digest.cc 2008-03-16 21:48:45 +0000 @@ -1392,9 +1392,7 @@ assert (!authUser()); user(aUser); - user()->lock() - - ; + user()->lock(); } AuthDigestUserRequest::CredentialsState === modified file 'src/auth/digest/auth_digest.h' --- src/auth/digest/auth_digest.h 2008-02-27 04:49:32 +0000 +++ src/auth/digest/auth_digest.h 2008-03-16 21:48:45 +0000 @@ -95,17 +95,10 @@ struct { - -unsigned int authinfo_sent: - 1; - + unsigned int authinfo_sent:1; unsigned int invalid_password:1; - -unsigned int helper_queried: - 1; - } - - flags; + unsigned int helper_queried:1; + } flags; digest_nonce_h *nonce; private: @@ -140,15 +133,9 @@ struct { - -unsigned int valid: - 1; - -unsigned int incache: - 1; - } - - flags; + unsigned int valid:1; + unsigned int incache:1; + } flags; }; /* configuration runtime data */ === modified file 'src/auth/negotiate/auth_negotiate.h' --- src/auth/negotiate/auth_negotiate.h 2008-02-27 04:49:32 +0000 +++ src/auth/negotiate/auth_negotiate.h 2008-03-16 22:10:18 +0000 @@ -39,8 +39,7 @@ void *data; AuthUserRequest *auth_user_request; RH *handler; -} -authenticateStateData; +} authenticateStateData; #endif /// \ingroup AuthNegotiateAPI === modified file 'src/auth/ntlm/auth_ntlm.h' --- src/auth/ntlm/auth_ntlm.h 2008-02-27 04:49:32 +0000 +++ src/auth/ntlm/auth_ntlm.h 2008-03-16 22:10:18 +0000 @@ -30,9 +30,7 @@ void *data; AuthUserRequest *auth_user_request; RH *handler; -} - -authenticateStateData; +} authenticateStateData; #endif class NTLMUser : public AuthUser === modified file 'src/cache_cf.cc' --- src/cache_cf.cc 2008-03-04 19:00:36 +0000 +++ src/cache_cf.cc 2008-03-16 21:48:45 +0000 @@ -2023,9 +2023,7 @@ l->domain = xstrdup(domain); - for (L = &(p->peer_domain); *L; L = &((*L)->next)) - - ; + for (L = &(p->peer_domain); *L; L = &((*L)->next)); *L = l; } } @@ -2057,9 +2055,7 @@ l->type = parseNeighborType(type); l->domain = xstrdup(domain); - for (L = &(p->typelist); *L; L = &((*L)->next)) - - ; + for (L = &(p->typelist); *L; L = &((*L)->next)); *L = l; } } === modified file 'src/cache_diff.cc' --- src/cache_diff.cc 2007-11-15 23:47:31 +0000 +++ src/cache_diff.cc 2008-03-16 22:10:18 +0000 @@ -48,9 +48,7 @@ int scanned_count; /* #scanned entries */ int bad_add_count; /* #duplicate adds */ int bad_del_count; /* #dels with no prior add */ -} - -CacheIndex; +} CacheIndex; typedef struct _CacheEntry @@ -60,9 +58,7 @@ struct _CacheEntry *next; /* StoreSwapLogData s; */ unsigned char key_arr[SQUID_MD5_DIGEST_LENGTH]; -} - -CacheEntry; +} CacheEntry; /* copied from url.c */ === modified file 'src/cache_manager.cc' --- src/cache_manager.cc 2008-02-27 04:49:32 +0000 +++ src/cache_manager.cc 2008-03-16 22:10:18 +0000 @@ -57,8 +57,7 @@ char *action; char *user_name; char *passwd; -} -cachemgrStateData; +} cachemgrStateData; static CacheManagerAction *cachemgrFindAction(const char *action); static cachemgrStateData *cachemgrParseUrl(const char *url); @@ -104,9 +103,7 @@ a->flags.pw_req = pw_req_flag; a->flags.atomic = atomic; - for (A = &ActionTable; *A; A = &(*A)->next) - - ; + for (A = &ActionTable; *A; A = &(*A)->next); *A = a; debugs(16, 3, "CacheManager::registerAction: registered " << action); @@ -271,9 +268,7 @@ mgr->entry = entry; - entry->lock() - - ; + entry->lock(); entry->expires = squid_curtime; debugs(16, 5, "CACHEMGR: " << fd_table[fd].ipaddr << " requesting '" << mgr->action << "'"); === modified file 'src/cbdata.cc' --- src/cbdata.cc 2008-02-27 04:49:32 +0000 +++ src/cbdata.cc 2008-03-16 21:48:45 +0000 @@ -158,8 +158,7 @@ */ void cbdata::operator delete(void *where, void *where2) -{ - ; +{; } long === modified file 'src/cf_gen.cc' --- src/cf_gen.cc 2007-09-18 02:21:23 +0000 +++ src/cf_gen.cc 2008-03-16 22:10:18 +0000 @@ -70,18 +70,14 @@ char *data; struct Line *next; -} - -Line; +} Line; typedef struct EntryAlias { struct EntryAlias *next; char *name; -} - -EntryAlias; +} EntryAlias; typedef struct Entry { @@ -98,9 +94,7 @@ int array_flag; struct Entry *next; -} - -Entry; +} Entry; typedef struct TypeDep { === modified file 'src/client_side.cc' --- src/client_side.cc 2008-02-27 04:49:32 +0000 +++ src/client_side.cc 2008-03-16 21:48:45 +0000 @@ -2035,9 +2035,7 @@ ClientSocketContext::Pointer *S; for (S = (ClientSocketContext::Pointer *) & currentobject; S->getRaw(); - S = &(*S)->next) - - ; + S = &(*S)->next); *S = context; ++nrequests; @@ -2050,9 +2048,7 @@ ClientSocketContext::Pointer *T; for (T = (ClientSocketContext::Pointer *) ¤tobject; - T->getRaw(); T = &(*T)->next, ++result) - - ; + T->getRaw(); T = &(*T)->next, ++result); return result; } @@ -2653,9 +2649,7 @@ assert(chr == NULL); /* add to the client request queue */ - for (H = &chr; *H; H = &(*H)->next) - - ; + for (H = &chr; *H; H = &(*H)->next); *H = http; clientStreamRead(http->client_stream.tail->data, http, 0, === modified file 'src/client_side.h' --- src/client_side.h 2008-02-27 04:49:32 +0000 +++ src/client_side.h 2008-03-16 22:10:18 +0000 @@ -74,9 +74,7 @@ unsigned deferred: 1; /* This is a pipelined request waiting for the current object to complete */ unsigned parsed_ok: 1; /* Was this parsed correctly? */ - } - - flags; + } flags; bool mayUseConnection() const {return mayUseConnection_;} void mayUseConnection(bool aBool) @@ -190,9 +188,7 @@ struct { bool readMoreRequests; - } - - flags; + } flags; http_port_list *port; bool transparent() const; === modified file 'src/client_side_reply.cc' --- src/client_side_reply.cc 2008-02-17 00:42:27 +0000 +++ src/client_side_reply.cc 2008-03-16 21:48:45 +0000 @@ -825,9 +825,7 @@ /* Swap in the metadata */ http->storeEntry(entry); - http->storeEntry()->lock() - - ; + http->storeEntry()->lock(); http->storeEntry()->createMemObject(http->uri, http->log_uri); http->storeEntry()->mem_obj->method = http->request->method; @@ -1605,9 +1603,7 @@ /* someone found the object in the cache for us */ StoreIOBuffer tempBuffer; - http->storeEntry()->lock() - - ; + http->storeEntry()->lock(); if (http->storeEntry()->mem_obj == NULL) { /* === modified file 'src/client_side_reply.h' --- src/client_side_reply.h 2008-02-09 01:31:02 +0000 +++ src/client_side_reply.h 2008-03-16 22:10:18 +0000 @@ -112,9 +112,7 @@ unsigned complete: 1; /* we have read all we can from upstream */ bool headersSent; - } - - flags; + } flags; clientStreamNode *ourNode; /* This will go away if/when this file gets refactored some more */ private: === modified file 'src/client_side_request.cc' --- src/client_side_request.cc 2008-02-13 06:07:52 +0000 +++ src/client_side_request.cc 2008-03-16 21:48:45 +0000 @@ -1020,9 +1020,7 @@ loggingEntry_ = newEntry; if (loggingEntry_) - loggingEntry_->lock() - - ; + loggingEntry_->lock(); } /* === modified file 'src/client_side_request.h' --- src/client_side_request.h 2008-02-13 06:07:52 +0000 +++ src/client_side_request.h 2008-03-16 21:48:45 +0000 @@ -105,9 +105,8 @@ int64_t offset; int64_t size; size_t headers_sz; - } + } out; - out; HttpHdrRangeIter range_iter; /* data for iterating thru range specs */ size_t req_sz; /* raw request size on input, not current request size */ log_type logType; @@ -117,32 +116,19 @@ struct { - -unsigned int accel: - 1; - -unsigned int transparent: - 1; - -unsigned int internal: - 1; - -unsigned int done_copying: - 1; - -unsigned int purging: - 1; - } - - flags; + unsigned int accel:1; + unsigned int transparent:1; + unsigned int internal:1; + unsigned int done_copying:1; + unsigned int purging:1; + } flags; struct { http_status status; char *location; - } + } redirect; - redirect; dlink_node active; dlink_list client_stream; int mRangeCLen(); === modified file 'src/comm_select.cc' --- src/comm_select.cc 2008-02-17 17:15:55 +0000 +++ src/comm_select.cc 2008-03-16 21:48:45 +0000 @@ -616,9 +616,7 @@ statCounter.select_time += (current_dtime - start); return COMM_OK; - } while (timeout > current_dtime) - - ; + } while (timeout > current_dtime); debugs(5, 8, "comm_select: time out: " << squid_curtime); return COMM_TIMEOUT; === modified file 'src/comm_select_win32.cc' --- src/comm_select_win32.cc 2008-02-24 19:59:08 +0000 +++ src/comm_select_win32.cc 2008-03-16 21:48:45 +0000 @@ -638,9 +638,7 @@ statCounter.select_time += (current_dtime - start); return COMM_OK; - } while (timeout > current_dtime) - - ; + } while (timeout > current_dtime); debugs(5, 8, "comm_select: time out: " << squid_curtime); return COMM_TIMEOUT; === modified file 'src/debug.cc' --- src/debug.cc 2008-02-27 01:43:30 +0000 +++ src/debug.cc 2008-03-16 21:48:45 +0000 @@ -223,9 +223,7 @@ } else { s = atoi(arg); - while (*arg && *arg++ != ',') - - ; + while (*arg && *arg++ != ','); } l = atoi(arg); === modified file 'src/dns_internal.cc' --- src/dns_internal.cc 2008-01-21 02:46:35 +0000 +++ src/dns_internal.cc 2008-03-16 22:10:18 +0000 @@ -1144,9 +1144,7 @@ } else { debugs(78, 1, "WARNING: Reply from unknown nameserver " << from << " (retrying..." << (squid_curtime-last_warning) << "<=60)" ); - } - - continue; + } continue; } idnsGrokReply(rbuf, len); === modified file 'src/errorpage.cc' --- src/errorpage.cc 2008-02-27 04:49:32 +0000 +++ src/errorpage.cc 2008-03-16 22:10:18 +0000 @@ -67,8 +67,7 @@ { int id; char *page_name; -} -ErrorDynamicPageInfo; +} ErrorDynamicPageInfo; /* local constant and vars */ === modified file 'src/errorpage.h' --- src/errorpage.h 2008-02-27 04:49:32 +0000 +++ src/errorpage.h 2008-03-16 21:48:45 +0000 @@ -104,21 +104,16 @@ struct { - -unsigned int flag_cbdata: - 1; - } - - flags; + unsigned int flag_cbdata:1; + } flags; struct { wordlist *server_msg; char *request; char *reply; - } + } ftp; - ftp; char *request_hdrs; char *err_msg; /* Preformatted error message from the cache */ === modified file 'src/external_acl.cc' --- src/external_acl.cc 2008-01-20 15:54:28 +0000 +++ src/external_acl.cc 2008-03-16 22:10:18 +0000 @@ -126,9 +126,7 @@ { QUOTE_METHOD_SHELL = 1, QUOTE_METHOD_URL - } - - quote; + } quote; IPAddress local_addr; }; === modified file 'src/forward.cc' --- src/forward.cc 2008-02-12 05:26:39 +0000 +++ src/forward.cc 2008-03-16 21:48:45 +0000 @@ -100,9 +100,7 @@ request = HTTPMSGLOCK(r); start_t = squid_curtime; - e->lock() - - ; + e->lock(); EBIT_SET(e->flags, ENTRY_FWD_HDR_WAIT); } @@ -519,9 +517,7 @@ FwdServer **T, *T2 = NULL; servers = fs->next; - for (T = &servers; *T; T2 = *T, T = &(*T)->next) - - ; + for (T = &servers; *T; T2 = *T, T = &(*T)->next); if (T2 && T2->_peer) { /* cycle */ *T = fs; === modified file 'src/forward.h' --- src/forward.h 2008-02-27 04:49:32 +0000 +++ src/forward.h 2008-03-16 22:10:18 +0000 @@ -95,17 +95,10 @@ struct { - -unsigned int dont_retry: - 1; - -unsigned int ftp_pasv_failed: - 1; - -unsigned int forward_completed:1; - } - - flags; + unsigned int dont_retry:1; + unsigned int ftp_pasv_failed:1; + unsigned int forward_completed:1; + } flags; #if LINUX_NETFILTER IPAddress src; #endif === modified file 'src/fqdncache.cc' --- src/fqdncache.cc 2008-02-27 04:49:32 +0000 +++ src/fqdncache.cc 2008-03-16 22:10:18 +0000 @@ -110,15 +110,9 @@ struct { - -unsigned int negcached: - 1; - -unsigned int fromhosts: - 1; - } - - flags; + unsigned int negcached:1; + unsigned int fromhosts:1; + } flags; }; /// \ingroup FQDNCacheInternal @@ -129,8 +123,7 @@ int hits; int misses; int negative_hits; -} -FqdncacheStats; +} FqdncacheStats; /// \ingroup FQDNCacheInternal static dlink_list lru_list; @@ -505,7 +498,6 @@ #if USE_DNSSERVERS fqdncacheParse(f, reply); - ; #else fqdncacheParse(f, answers, na, error_message); === modified file 'src/fs/coss/StoreFScoss.h' --- src/fs/coss/StoreFScoss.h 2008-02-27 04:49:32 +0000 +++ src/fs/coss/StoreFScoss.h 2008-03-16 22:10:18 +0000 @@ -54,9 +54,7 @@ int alloc; int realloc; int collisions; - } - - alloc; + } alloc; int disk_overflows; int stripe_overflows; int open_mem_hits; === modified file 'src/fs/coss/store_coss.h' --- src/fs/coss/store_coss.h 2008-02-27 04:49:32 +0000 +++ src/fs/coss/store_coss.h 2008-03-16 21:48:45 +0000 @@ -74,15 +74,9 @@ struct { - -unsigned int reading: - 1; - -unsigned int writing: - 1; - } - - flags; + unsigned int reading:1; + unsigned int writing:1; + } flags; CossMemBuf *locked_membuf; off_t st_size; === modified file 'src/fs/coss/store_dir_coss.cc' --- src/fs/coss/store_dir_coss.cc 2007-11-15 23:47:31 +0000 +++ src/fs/coss/store_dir_coss.cc 2008-03-16 22:10:18 +0000 @@ -67,12 +67,8 @@ struct { - -unsigned int clean: - 1; - } - - flags; + unsigned int clean:1; + } flags; struct _store_rebuild_data counts; }; @@ -111,9 +107,7 @@ while (strlen(pathtmp) && pathtmp[strlen(pathtmp) - 1] == '.') pathtmp[strlen(pathtmp) - 1] = '\0'; - for (pathtmp2 = pathtmp; *pathtmp2 == '.'; pathtmp2++) - - ; + for (pathtmp2 = pathtmp; *pathtmp2 == '.'; pathtmp2++); snprintf(path, SQUID_MAXPATHLEN - 64, Config.Log.swap, pathtmp2); if (strncmp(path, Config.Log.swap, SQUID_MAXPATHLEN - 64) == 0) { @@ -450,9 +444,7 @@ storeCossRemove(rb->sd, e); rb->counts.objcount--; rb->counts.cancelcount++; - } - - continue; + } continue; } else { x = log(static_cast(++rb->counts.bad_log_op)) / log(10.0); === modified file 'src/fs/ufs/store_dir_ufs.cc' --- src/fs/ufs/store_dir_ufs.cc 2007-12-02 14:19:58 +0000 +++ src/fs/ufs/store_dir_ufs.cc 2008-03-16 21:48:45 +0000 @@ -602,9 +602,7 @@ while (strlen(pathtmp) && pathtmp[strlen(pathtmp) - 1] == '.') pathtmp[strlen(pathtmp) - 1] = '\0'; - for (pathtmp2 = pathtmp; *pathtmp2 == '.'; pathtmp2++) - - ; + for (pathtmp2 = pathtmp; *pathtmp2 == '.'; pathtmp2++); snprintf(lpath, SQUID_MAXPATHLEN - 64, Config.Log.swap, pathtmp2); if (strncmp(lpath, Config.Log.swap, SQUID_MAXPATHLEN - 64) == 0) { === modified file 'src/fs/ufs/ufscommon.cc' --- src/fs/ufs/ufscommon.cc 2007-11-15 23:47:31 +0000 +++ src/fs/ufs/ufscommon.cc 2008-03-16 22:10:18 +0000 @@ -535,9 +535,7 @@ currentEntry()->release(); counts.objcount--; counts.cancelcount++; - } - - continue; + } continue; } else { x = ::log(static_cast(++counts.bad_log_op)) / ::log(10.0); @@ -604,9 +602,7 @@ } else { debug_trap("commonUfsDirRebuildFromSwapLog: bad condition"); debugs(47, 1, "\tSee " << __FILE__ << ":" << __LINE__); - } - - continue; + } continue; } else if (used) { /* swapfile in use, not by this URL, log entry is newer */ /* This is sorta bad: the log entry should NOT be newer at this === modified file 'src/fs/ufs/ufscommon.h' --- src/fs/ufs/ufscommon.h 2008-02-27 04:49:32 +0000 +++ src/fs/ufs/ufscommon.h 2008-03-16 22:10:18 +0000 @@ -274,9 +274,7 @@ * try to close again in the I/O callbacks. */ bool try_closing; - } - - flags; + } flags; link_list *pending_reads; link_list *pending_writes; void queueRead(char *, size_t, off_t, STRCB *, void *); @@ -398,18 +396,10 @@ struct { - -unsigned int need_to_validate: - 1; - -unsigned int clean: - 1; - -unsigned int init: - 1; - } - - flags; + unsigned int need_to_validate:1; + unsigned int clean:1; + unsigned int init:1; + } flags; int in_dir; int done; int fn; === modified file 'src/ftp.cc' --- src/ftp.cc 2008-02-27 04:49:32 +0000 +++ src/ftp.cc 2008-03-16 22:10:18 +0000 @@ -169,9 +169,7 @@ char *last_command; char *last_reply; int replycode; - } - - ctrl; + } ctrl; struct { @@ -180,9 +178,7 @@ char *host; u_short port; bool read_pending; - } - - data; + } data; struct _ftp_flags flags; @@ -274,8 +270,7 @@ char *name; char *showname; char *link; -} -ftpListParts; +} ftpListParts; /// \ingroup ServerProtocolFTPInternal #define FTP_LOGIN_ESCAPED 1 @@ -1021,9 +1016,7 @@ const char *p; snprintf(html, 8192, "%s\n", line); - for (p = line; *p && xisspace(*p); p++) - - ; + for (p = line; *p && xisspace(*p); p++); if (*p && !xisspace(*p)) flags.listformat_unknown = 1; @@ -1866,9 +1859,7 @@ } /* Move the last line of the reply message to ctrl.last_reply */ - for (W = &ctrl.message; (*W)->next; W = &(*W)->next) - - ; + for (W = &ctrl.message; (*W)->next; W = &(*W)->next); safe_free(ctrl.last_reply); ctrl.last_reply = xstrdup((*W)->key); === modified file 'src/gopher.cc' --- src/gopher.cc 2008-02-27 04:49:32 +0000 +++ src/gopher.cc 2008-03-16 22:10:18 +0000 @@ -136,9 +136,7 @@ HttpRequest *req; FwdState::Pointer fwd; char replybuf[BUFSIZ]; -} - -GopherStateData; +} GopherStateData; static PF gopherStateFree; static void gopher_mime_content(MemBuf * mb, const char *name, const char *def); @@ -1013,9 +1011,7 @@ gopherState = cbdataAlloc(GopherStateData); gopherState->buf = (char *)memAllocate(MEM_4K_BUF); - entry->lock() - - ; + entry->lock(); gopherState->entry = entry; gopherState->fwd = fwd; === modified file 'src/helper.h' --- src/helper.h 2008-02-27 04:49:32 +0000 +++ src/helper.h 2008-03-16 22:10:18 +0000 @@ -77,9 +77,7 @@ int replies; int queue_size; int avg_svc_time; - } - - stats; + } stats; }; struct _helper_stateful @@ -105,9 +103,7 @@ int replies; int queue_size; int avg_svc_time; - } - - stats; + } stats; }; struct _helper_server @@ -133,26 +129,16 @@ struct _helper_flags { - -unsigned int writing: - 1; - -unsigned int closing: - 1; - -unsigned int shutdown: - 1; - } - - flags; + unsigned int writing:1; + unsigned int closing:1; + unsigned int shutdown:1; + } flags; struct { int uses; unsigned int pending; - } - - stats; + } stats; void *hIpc; }; @@ -183,19 +169,11 @@ struct _helper_stateful_flags { - -unsigned int busy: - 1; - -unsigned int closing: - 1; - -unsigned int shutdown: - 1; + unsigned int busy:1; + unsigned int closing:1; + unsigned int shutdown:1; stateful_helper_reserve_t reserved; - } - - flags; + } flags; struct { @@ -204,9 +182,7 @@ int releases; int deferbyfunc; int deferbycb; - } - - stats; + } stats; int deferred_requests; /* current number of deferred requests */ void *data; /* State data used by the calling routines */ void *hIpc; === modified file 'src/htcp.cc' --- src/htcp.cc 2008-02-27 04:49:32 +0000 +++ src/htcp.cc 2008-03-16 21:48:45 +0000 @@ -75,41 +75,23 @@ struct _htcpDataHeaderSquid { u_int16_t length; + #if !WORDS_BIGENDIAN - -unsigned int opcode: - 4; - -unsigned int response: - 4; + unsigned int opcode:4; + unsigned int response:4; #else - -unsigned int response: - 4; - -unsigned int opcode: - 4; + unsigned int response:4; + unsigned int opcode:4; #endif + #if !WORDS_BIGENDIAN - -unsigned int reserved: - 6; - -unsigned int F1: - 1; - -unsigned int RR: - 1; + unsigned int reserved:6; + unsigned int F1:1; + unsigned int RR:1; #else - -unsigned int RR: - 1; - -unsigned int F1: - 1; - -unsigned int reserved: - 6; + unsigned int RR:1; + unsigned int F1:1; + unsigned int reserved:6; #endif u_int32_t msg_id; @@ -118,41 +100,23 @@ struct _htcpDataHeader { u_int16_t length; + #if WORDS_BIGENDIAN - -u_int8_t opcode: - 4; - -u_int8_t response: - 4; + u_int8_t opcode:4; + u_int8_t response:4; #else - -u_int8_t response: - 4; - -u_int8_t opcode: - 4; + u_int8_t response:4; + u_int8_t opcode:4; #endif + #if WORDS_BIGENDIAN - -u_int8_t reserved: - 6; - -u_int8_t F1: - 1; - -u_int8_t RR: - 1; + u_int8_t reserved:6; + u_int8_t F1:1; + u_int8_t RR:1; #else - -u_int8_t RR: - 1; - -u_int8_t F1: - 1; - -u_int8_t reserved: - 6; + u_int8_t RR:1; + u_int8_t F1:1; + u_int8_t reserved:6; #endif u_int32_t msg_id; === modified file 'src/htcp.h' --- src/htcp.h 2008-02-27 04:49:32 +0000 +++ src/htcp.h 2008-03-16 22:10:18 +0000 @@ -54,9 +54,7 @@ double rtt; int samp; int hops; - } - - cto; + } cto; }; /// \bug redundant typedef === modified file 'src/ident.cc' --- src/ident.cc 2007-12-15 06:11:41 +0000 +++ src/ident.cc 2008-03-16 22:10:18 +0000 @@ -46,9 +46,7 @@ void *callback_data; struct _IdentClient *next; -} - -IdentClient; +} IdentClient; typedef struct _IdentStateData { @@ -60,9 +58,7 @@ IPAddress my_peer; IdentClient *clients; char buf[4096]; -} - -IdentStateData; +} IdentStateData; static IOCB identReadReply; static PF identClose; @@ -179,9 +175,7 @@ if (strstr(buf, "USERID")) { if ((ident = strrchr(buf, ':'))) { - while (xisspace(*++ident)) - - ; + while (xisspace(*++ident)); identCallback(state, ident); } } @@ -198,9 +192,7 @@ c->callback = callback; c->callback_data = cbdataReference(callback_data); - for (C = &state->clients; *C; C = &(*C)->next) - - ; + for (C = &state->clients; *C; C = &(*C)->next); *C = c; } === modified file 'src/ipcache.cc' --- src/ipcache.cc 2008-02-27 04:49:32 +0000 +++ src/ipcache.cc 2008-03-16 22:10:18 +0000 @@ -110,15 +110,9 @@ struct { - -unsigned int negcached: - 1; - -unsigned int fromhosts: - 1; - } - - flags; + unsigned int negcached:1; + unsigned int fromhosts:1; + } flags; }; /// \ingroup IPCacheInternal @@ -135,8 +129,7 @@ int rr_cname; int cname_only; int invalid; -} -IpcacheStats; +} IpcacheStats; /// \ingroup IPCacheInternal static dlink_list lru_list; === modified file 'src/mem_node.h' --- src/mem_node.h 2008-02-27 04:49:32 +0000 +++ src/mem_node.h 2008-03-16 21:48:45 +0000 @@ -58,9 +58,7 @@ StoreIOBuffer nodeBuffer; /* Private */ char data[SM_PAGE_SIZE]; - -unsigned int write_pending: - 1; + unsigned int write_pending:1; }; MEMPROXY_CLASS_INLINE(mem_node) /**DOCS_NOSEMI*/ === modified file 'src/mime.cc' --- src/mime.cc 2007-08-13 23:20:50 +0000 +++ src/mime.cc 2008-03-16 21:48:45 +0000 @@ -74,11 +74,9 @@ char *content_encoding; char transfer_mode; -unsigned int view_option: - 1; + unsigned int view_option:1; + unsigned int download_option:1; -unsigned int download_option: - 1; mimeEntry *next; MimeIcon theIcon; }; === modified file 'src/net_db.cc' --- src/net_db.cc 2008-01-08 00:12:28 +0000 +++ src/net_db.cc 2008-03-16 22:10:18 +0000 @@ -78,9 +78,7 @@ char buf[NETDB_REQBUF_SZ]; int buf_ofs; netdb_conn_state_t connstate; -} - -netdbExchangeState; +} netdbExchangeState; static hash_table *addr_table = NULL; static hash_table *host_table = NULL; === modified file 'src/peer_digest.cc' --- src/peer_digest.cc 2008-01-08 00:12:28 +0000 +++ src/peer_digest.cc 2008-03-16 21:48:45 +0000 @@ -376,9 +376,7 @@ if (old_e) { debugs(72, 5, "peerDigestRequest: found old entry"); - old_e->lock() - - ; + old_e->lock(); old_e->createMemObject(url, url); fetch->old_sc = storeClientListAdd(old_e, fetch); === modified file 'src/peer_select.cc' --- src/peer_select.cc 2008-01-20 15:54:28 +0000 +++ src/peer_select.cc 2008-03-16 22:10:18 +0000 @@ -73,9 +73,7 @@ static struct { int timeouts; -} - -PeerStats; +} PeerStats; static const char *DirectStr[] = { === modified file 'src/redirect.cc' --- src/redirect.cc 2008-02-13 06:58:47 +0000 +++ src/redirect.cc 2008-03-16 22:10:18 +0000 @@ -53,9 +53,7 @@ const char *client_ident; const char *method_s; RH *handler; -} - -redirectStateData; +} redirectStateData; static HLPCB redirectHandleReply; static void redirectStateFree(redirectStateData * r); === modified file 'src/refresh.cc' --- src/refresh.cc 2007-05-24 07:45:03 +0000 +++ src/refresh.cc 2008-03-16 22:10:18 +0000 @@ -64,9 +64,7 @@ bool min; bool lmfactor; bool max; -} - -stale_flags; +} stale_flags; /* * This enumerated list assigns specific values, ala HTTP/FTP status === modified file 'src/repl/heap/store_repl_heap.cc' --- src/repl/heap/store_repl_heap.cc 2007-04-30 22:56:09 +0000 +++ src/repl/heap/store_repl_heap.cc 2008-03-16 21:48:45 +0000 @@ -234,9 +234,7 @@ if (entry->locked()) { - entry->lock() - - ; + entry->lock(); linklistPush(&heap_walker->locked_entries, entry); goto try_again; === modified file 'src/stat.cc' --- src/stat.cc 2008-02-13 06:58:47 +0000 +++ src/stat.cc 2008-03-16 21:48:45 +0000 @@ -379,9 +379,7 @@ state->sentry = sentry; state->filter = filter; - sentry->lock() - - ; + sentry->lock(); state->theSearch = Store::Root().search(NULL, NULL); eventAdd("statObjects", statObjects, state, 0.0, 1); === modified file 'src/store.cc' --- src/store.cc 2008-02-13 06:33:48 +0000 +++ src/store.cc 2008-03-16 22:10:18 +0000 @@ -905,19 +905,13 @@ int private_key; int too_many_open_files; int too_many_open_fds; - } - - no; + } no; struct { int Default; - } - - yes; -} - -store_check_cachable_hist; + } yes; +} store_check_cachable_hist; int storeTooManyDiskFilesOpen(void) === modified file 'src/store_client.cc' --- src/store_client.cc 2008-01-08 00:12:28 +0000 +++ src/store_client.cc 2008-03-16 21:48:45 +0000 @@ -585,8 +585,7 @@ /* * we have (part of) what they want */ - size_t copy_sz = XMIN(copyInto.length, body_sz) - ; + size_t copy_sz = XMIN(copyInto.length, body_sz); debugs(90, 3, "storeClientReadHeader: copying " << copy_sz << " bytes of body"); xmemmove(copyInto.data, copyInto.data + mem->swap_hdr_sz, copy_sz); === modified file 'src/store_digest.cc' --- src/store_digest.cc 2008-01-08 00:12:28 +0000 +++ src/store_digest.cc 2008-03-16 22:10:18 +0000 @@ -79,9 +79,7 @@ int add_coll_count; /* #accepted entries that collided with existing ones */ int rej_count; /* #store entries not accepted to store_digest */ int rej_coll_count; /* #not accepted entries that collided with existing ones */ -} - -StoreDigestStats; +} StoreDigestStats; /* local vars */ static StoreDigestState sd_state; === modified file 'src/store_io.cc' --- src/store_io.cc 2007-04-30 22:56:09 +0000 +++ src/store_io.cc 2008-03-16 22:10:18 +0000 @@ -12,12 +12,8 @@ int select_fail; int create_fail; int success; - } - - create; -} - -store_io_stats; + } create; +} store_io_stats; OBJH storeIOStats; === modified file 'src/store_rebuild.cc' --- src/store_rebuild.cc 2007-04-29 04:26:37 +0000 +++ src/store_rebuild.cc 2008-03-16 22:10:18 +0000 @@ -51,9 +51,7 @@ int total; /* number of entries read so far */ int scanned; -} - -store_rebuild_progress; +} store_rebuild_progress; static store_rebuild_progress *RebuildProgress = NULL; === modified file 'src/store_swapout.cc' --- src/store_swapout.cc 2007-08-17 04:03:32 +0000 +++ src/store_swapout.cc 2008-03-16 21:48:45 +0000 @@ -78,9 +78,7 @@ /* Don't lock until after create, or the replacement * code might get confused */ - e->lock() - - ; + e->lock(); /* Pick up the file number if it was assigned immediately */ e->swap_filen = mem->swapout.sio->swap_filen; === modified file 'src/structs.h' --- src/structs.h 2008-02-12 05:28:47 +0000 +++ src/structs.h 2008-03-16 22:10:18 +0000 @@ -151,9 +151,7 @@ */ int highWaterMark; int lowWaterMark; - } - - Swap; + } Swap; size_t memMaxSize; struct @@ -161,9 +159,7 @@ int64_t min; int pct; int64_t max; - } - - quickAbort; + } quickAbort; int64_t readAheadGap; RemovalPolicySettings *replPolicy; RemovalPolicySettings *memPolicy; @@ -199,9 +195,7 @@ time_t idns_query; #endif - } - - Timeout; + } Timeout; size_t maxRequestHeaderSize; int64_t maxRequestBodySize; size_t maxReplyHeaderSize; @@ -218,10 +212,7 @@ u_short snmp; #endif - - } - - Port; + } Port; struct { @@ -231,18 +222,14 @@ https_port_list *https; #endif - } - - Sockaddr; + } Sockaddr; #if SQUID_SNMP struct { char *configFile; char *agentInfo; - } - - Snmp; + } Snmp; #endif #if USE_WCCP @@ -253,9 +240,7 @@ IPAddress address; int version; - } - - Wccp; + } Wccp; #endif #if USE_WCCPv2 @@ -270,9 +255,7 @@ int weight; int rebuildwait; void *info; - } - - Wccp2; + } Wccp2; #endif #if USE_ICMP @@ -304,9 +287,7 @@ customlog *accesslogs; int rotateNumber; - } - - Log; + } Log; char *adminEmail; char *EmailFrom; char *EmailProgram; @@ -332,9 +313,7 @@ char *ssl_password; #endif - } - - Program; + } Program; #if USE_DNSSERVERS int dnsChildren; @@ -352,9 +331,7 @@ char *surrogate_id; #endif - } - - Accel; + } Accel; char *appendDomain; size_t appendDomainLen; char *debugOptions; @@ -373,9 +350,7 @@ char *file; time_t period; u_short port; - } - - Announce; + } Announce; struct { @@ -391,9 +366,7 @@ #endif /* FIXME INET6 : this should really be a CIDR value */ IPAddress client_netmask; - } - - Addrs; + } Addrs; size_t tcpRcvBufsz; size_t udpMaxHitObjsz; wordlist *hierarchy_stoplist; @@ -408,16 +381,12 @@ int size; int low; int high; - } - - ipcache; + } ipcache; struct { int size; - } - - fqdncache; + } fqdncache; int minDirectHops; int minDirectRtt; cachemgr_passwd *passwd_list; @@ -429,18 +398,14 @@ int64_t maxObjectSize; int64_t minObjectSize; size_t maxInMemObjSize; - } - - Store; + } Store; struct { int high; int low; time_t period; - } - - Netdb; + } Netdb; struct { @@ -500,9 +465,7 @@ int global_internal_static; int dns_require_A; int debug_override_X; - } - - onoff; + } onoff; class ACL *aclList; @@ -542,9 +505,7 @@ acl_access *ssl_bump; #endif - } - - accessList; + } accessList; acl_deny_info_list *denyInfoList; authConfig authConfiguration; @@ -557,9 +518,7 @@ int epsv_all; int sanitycheck; int telnet; - } - - Ftp; + } Ftp; refresh_t *Refresh; struct _cacheSwap @@ -567,33 +526,25 @@ RefCount *swapDirs; int n_allocated; int n_configured; - } - - cacheSwap; + } cacheSwap; struct { char *directory; int use_short_names; - } - - icons; + } icons; char *errorDirectory; struct { int maxtries; int onerror; - } - - retry; + } retry; struct { size_t limit; - } - - MemPools; + } MemPools; #if DELAY_POOLS DelayConfig Delay; @@ -607,9 +558,7 @@ int icp_min_poll; int dns_min_poll; int http_min_poll; - } - - comm_incoming; + } comm_incoming; int max_open_disk_fds; int uri_whitespace; int64_t rangeOffsetLimit; @@ -622,9 +571,7 @@ int ttl; unsigned short port; char *encode_key; - } - - mcast_miss; + } mcast_miss; #endif /* one access list per header type we know of */ @@ -642,9 +589,7 @@ time_t rewrite_period; size_t swapout_chunk_size; int rebuild_chunk_percentage; - } - - digest; + } digest; #endif #if USE_SSL @@ -652,9 +597,7 @@ { int unclean_shutdown; char *ssl_engine; - } - - SSL; + } SSL; #endif wordlist *ext_methods; @@ -664,9 +607,7 @@ int high_rptm; int high_pf; size_t high_memory; - } - - warnings; + } warnings; char *store_dir_select_algorithm; int sleep_after_fork; /* microseconds */ time_t minimum_expiry_time; /* seconds */ @@ -686,9 +627,7 @@ char *flags; acl_access *cert_error; SSL_CTX *sslContext; - } - - ssl_client; + } ssl_client; #endif char *accept_filter; @@ -701,9 +640,7 @@ { int enable_purge; int mangle_request_headers; - } - - onoff; + } onoff; uid_t effectiveUserID; gid_t effectiveGroupID; }; @@ -841,41 +778,18 @@ struct _http_state_flags { - -unsigned int proxying: - 1; - -unsigned int keepalive: - 1; - -unsigned int only_if_cached: - 1; - -unsigned int headers_parsed: - 1; - -unsigned int front_end_https: - 2; - -unsigned int originpeer: - 1; - -unsigned int keepalive_broken: - 1; - -unsigned int abuse_detected: - 1; - -unsigned int request_sent: - 1; - -unsigned int do_next_read: - 1; - -unsigned int consume_body_data: - 1; - -unsigned int chunked:1; + unsigned int proxying:1; + unsigned int keepalive:1; + unsigned int only_if_cached:1; + unsigned int headers_parsed:1; + unsigned int front_end_https:2; + unsigned int originpeer:1; + unsigned int keepalive_broken:1; + unsigned int abuse_detected:1; + unsigned int request_sent:1; + unsigned int do_next_read:1; + unsigned int consume_body_data:1; + unsigned int chunked:1; }; struct _ipcache_addrs @@ -942,18 +856,14 @@ time_t last_connect_probe; int logged_state; /* so we can print dead/revived msgs */ int conn_open; /* current opened connections */ - } - - stats; + } stats; struct { int version; int counts[ICP_END+1]; u_short port; - } - - icp; + } icp; #if USE_HTCP struct @@ -961,9 +871,7 @@ double version; int counts[2]; u_short port; - } - - htcp; + } htcp; #endif u_short http_port; @@ -973,63 +881,30 @@ struct { - -unsigned int proxy_only: - 1; - -unsigned int no_query: - 1; - -unsigned int background_ping: - 1; - -unsigned int no_digest: - 1; - -unsigned int default_parent: - 1; - -unsigned int roundrobin: - 1; - -unsigned int weighted_roundrobin: - 1; - -unsigned int mcast_responder: - 1; - -unsigned int closest_only: - 1; + unsigned int proxy_only:1; + unsigned int no_query:1; + unsigned int background_ping:1; + unsigned int no_digest:1; + unsigned int default_parent:1; + unsigned int roundrobin:1; + unsigned int weighted_roundrobin:1; + unsigned int mcast_responder:1; + unsigned int closest_only:1; #if USE_HTCP - -unsigned int htcp: - 1; - -unsigned int htcp_oldsquid: - 1; + unsigned int htcp:1; + unsigned int htcp_oldsquid:1; #endif - -unsigned int no_netdb_exchange: - 1; + unsigned int no_netdb_exchange:1; #if DELAY_POOLS - -unsigned int no_delay: - 1; + unsigned int no_delay:1; #endif - -unsigned int allow_miss: - 1; + unsigned int allow_miss:1; #if USE_CARP - -unsigned int carp: - 1; + unsigned int carp:1; #endif - -unsigned int originserver: - 1; - } - - options; + unsigned int originserver:1; + } options; + int weight; int basetime; @@ -1043,18 +918,10 @@ struct { - -unsigned int count_event_pending: - 1; - -unsigned int counting: - 1; - } - - flags; - } - - mcast; + unsigned int count_event_pending:1; + unsigned int counting:1; + } flags; + } mcast; #if USE_CACHE_DIGESTS PeerDigest *digest; @@ -1076,9 +943,7 @@ unsigned int hash; double load_multiplier; double load_factor; /* normalized weight value */ - } - - carp; + } carp; #endif char *login; /* Proxy authorization */ @@ -1164,68 +1029,31 @@ #if LINUX_TPROXY tproxy = 0; #endif - } -unsigned int range: - 1; - -unsigned int nocache: - 1; - -unsigned int ims: - 1; - -unsigned int auth: - 1; - -unsigned int cachable: - 1; - -unsigned int hierarchical: - 1; - -unsigned int loopdetect: - 1; - -unsigned int proxy_keepalive: - 1; - -unsigned int proxying: - 1; /* this should be killed, also in httpstateflags */ - -unsigned int refresh: - 1; - -unsigned int redirected: - 1; - -unsigned int need_validation: - 1; + unsigned int range:1; + unsigned int nocache:1; + unsigned int ims:1; + unsigned int auth:1; + unsigned int cachable:1; + unsigned int hierarchical:1; + unsigned int loopdetect:1; + unsigned int proxy_keepalive:1; + unsigned int proxying:1; /* this should be killed, also in httpstateflags */ + unsigned int refresh:1; + unsigned int redirected:1; + unsigned int need_validation:1; #if HTTP_VIOLATIONS - -unsigned int nocache_hack: - 1; /* for changing/ignoring no-cache requests */ + unsigned int nocache_hack:1; /* for changing/ignoring no-cache requests */ #endif - -unsigned int accelerated: - 1; - -unsigned int transparent: - 1; - + unsigned int accelerated:1; + unsigned int transparent:1; #if LINUX_TPROXY -unsigned int tproxy: - 1; /* spoof client ip using tproxy */ + unsigned int tproxy:1; /* spoof client ip using tproxy */ #endif -unsigned int internal: - 1; - -unsigned int internalclient: - 1; - -unsigned int must_keepalive: - 1; + unsigned int internal:1; + unsigned int internalclient:1; + unsigned int must_keepalive:1; // When adding new flags, please update cloneAdaptationImmune() as needed. @@ -1241,11 +1069,8 @@ private: -unsigned int reset_tcp: - 1; - -unsigned int destinationIPLookedUp_: - 1; + unsigned int reset_tcp:1; + unsigned int destinationIPLookedUp_:1; }; struct _link_list @@ -1273,42 +1098,19 @@ struct { - -unsigned int icase: - 1; - -unsigned int refresh_ims: - 1; + unsigned int icase:1; + unsigned int refresh_ims:1; #if HTTP_VIOLATIONS - -unsigned int override_expire: - 1; - -unsigned int override_lastmod: - 1; - -unsigned int reload_into_ims: - 1; - -unsigned int ignore_reload: - 1; - -unsigned int ignore_no_cache: - 1; - -unsigned int ignore_no_store: - 1; - -unsigned int ignore_private: - 1; - -unsigned int ignore_auth: - 1; + unsigned int override_expire:1; + unsigned int override_lastmod:1; + unsigned int reload_into_ims:1; + unsigned int ignore_reload:1; + unsigned int ignore_no_cache:1; + unsigned int ignore_no_store:1; + unsigned int ignore_private:1; + unsigned int ignore_auth:1; #endif - - } - - flags; + } flags; }; /* @@ -1351,9 +1153,7 @@ StatHist nh_svc_time; StatHist hit_svc_time; StatHist all_svc_time; - } - - client_http; + } client_http; struct { @@ -1364,12 +1164,8 @@ int errors; kb_t kbytes_in; kb_t kbytes_out; - } - - all , http, ftp, other; - } - - server; + } all , http, ftp, other; + } server; struct { @@ -1393,31 +1189,23 @@ StatHist reply_svc_time; int query_timeouts; int times_used; - } - - icp; + } icp; struct { int pkts_sent; int pkts_recv; - } - - htcp; + } htcp; struct { int requests; - } - - unlink; + } unlink; struct { StatHist svc_time; - } - - dns; + } dns; struct { @@ -1433,16 +1221,12 @@ #endif StatHist on_xition_count; - } - - cd; + } cd; struct { int times_used; - } - - netdb; + } netdb; int page_faults; int select_loops; int select_fds; @@ -1457,7 +1241,6 @@ struct { - struct { int opens; @@ -1466,9 +1249,7 @@ int writes; int seeks; int unlinks; - } - - disk; + } disk; struct { @@ -1481,13 +1262,9 @@ int writes; int recvfroms; int sendtos; - } - - sock; + } sock; int selects; - } - - syscalls; + } syscalls; int aborted_requests; struct @@ -1495,9 +1272,7 @@ int files_cleaned; int outs; int ins; - } - - swap; + } swap; }; /* per header statistics */ @@ -1533,18 +1308,14 @@ kb_t kbytes_in; kb_t kbytes_out; kb_t hit_kbytes_out; - } - - Http, Icp; + } Http, Icp; struct { time_t time; int n_req; int n_denied; - } - - cutoff; + } cutoff; int n_established; /* number of current established connections */ time_t last_seen; }; @@ -1587,9 +1358,7 @@ { unsigned int fatal; unsigned int syslog; - } - - flags; + } flags; int syslog_priority; }; === modified file 'src/test_cache_digest.cc' --- src/test_cache_digest.cc 2008-01-20 15:54:28 +0000 +++ src/test_cache_digest.cc 2008-03-16 22:10:18 +0000 @@ -45,9 +45,7 @@ int true_miss_count; int false_hit_count; int false_miss_count; -} - -CacheQueryStats; +} CacheQueryStats; typedef struct _Cache Cache; @@ -72,9 +70,7 @@ struct _CacheEntry *next; unsigned char key_arr[SQUID_MD5_DIGEST_LENGTH]; /* storeSwapLogData s; */ -} - -CacheEntry; +} CacheEntry; /* parsed access log entry */ @@ -83,9 +79,7 @@ cache_key key[SQUID_MD5_DIGEST_LENGTH]; time_t timestamp; short int use_icp; /* true/false */ -} - -RawAccessLogEntry; +} RawAccessLogEntry; typedef enum { frError = -2, frMore = -1, frEof = 0, frOk = 1 === modified file 'src/tests/testAuth.cc' --- src/tests/testAuth.cc 2006-08-21 06:50:40 +0000 +++ src/tests/testAuth.cc 2008-03-16 21:48:45 +0000 @@ -118,7 +118,8 @@ params[]={ {"digest", digest_parms, 2}, {"basic", basic_parms, 2}, {"ntlm", ntlm_parms, 1}, - {"negotiate", negotiate_parms, 1}}; + {"negotiate", negotiate_parms, 1} + }; for (unsigned scheme=0; scheme < 4; scheme++) setup_scheme(getConfig(params[scheme].name), params[scheme].params, params[scheme].paramlength); === modified file 'src/tests/testEvent.cc' --- src/tests/testEvent.cc 2008-02-26 07:21:13 +0000 +++ src/tests/testEvent.cc 2008-03-16 21:48:45 +0000 @@ -80,8 +80,7 @@ "\n" "Operation \tNext Execution \tWeight\tCallback Valid?\n" "test event \t0.000 sec\t 0\t N/A\n" - "test event2 \t0.000 sec\t 0\t N/A\n" - ; + "test event2 \t0.000 sec\t 0\t N/A\n"; scheduler.schedule("last event", CalledEvent::Handler, &event, 0, 0, false); === modified file 'src/tools.cc' --- src/tools.cc 2008-02-12 05:44:50 +0000 +++ src/tools.cc 2008-03-16 21:48:45 +0000 @@ -582,9 +582,7 @@ } - while (pid > 0 || (pid < 0 && errno == EINTR)) - - ; + while (pid > 0 || (pid < 0 && errno == EINTR)); signal(sig, sig_child); #endif === modified file 'src/typedefs.h' --- src/typedefs.h 2008-02-27 04:49:32 +0000 +++ src/typedefs.h 2008-03-16 22:10:18 +0000 @@ -46,9 +46,7 @@ { size_t bytes; size_t kb; -} - -kb_t; +} kb_t; typedef struct _acl_time_data acl_time_data; === modified file 'src/urn.cc' --- src/urn.cc 2008-01-20 15:54:28 +0000 +++ src/urn.cc 2008-03-16 22:10:18 +0000 @@ -70,12 +70,8 @@ struct { - -unsigned int force_menu: - 1; - } - - flags; + unsigned int force_menu:1; + } flags; char reqbuf[URN_REQBUF_SZ]; int reqofs; @@ -92,12 +88,8 @@ struct { int cached; - } - - flags; -} - -url_entry; + } flags; +} url_entry; static STCB urnHandleReply; static url_entry *urnParseReply(const char *inbuf, const HttpRequestMethod&); @@ -249,9 +241,7 @@ entry = e; request = HTTPMSGLOCK(r); - entry->lock() - - ; + entry->lock(); setUriResFromRequest(r); if (urlres_r == NULL) @@ -271,9 +261,7 @@ FwdState::fwdStart(-1, urlres_e, urlres_r); } else { - urlres_e->lock() - - ; + urlres_e->lock(); sc = storeClientListAdd(urlres_e, this); } === modified file 'src/wccp2.cc' --- src/wccp2.cc 2008-02-09 10:48:05 +0000 +++ src/wccp2.cc 2008-03-16 21:48:45 +0000 @@ -442,7 +442,6 @@ uint32_t change_num; char *wccp2_identity_info_ptr; - ; struct wccp2_security_md5_t *security_info; === modified file 'src/whois.cc' --- src/whois.cc 2007-05-29 19:31:36 +0000 +++ src/whois.cc 2008-03-16 21:48:45 +0000 @@ -91,9 +91,7 @@ p->fwd = fwd; p->dataWritten = false; - p->entry->lock() - - ; + p->entry->lock(); comm_add_close_handler(fd, whoisClose, p); l = p->request->urlpath.size() + 3; === modified file 'tools/cachemgr.cc' --- tools/cachemgr.cc 2007-12-15 06:11:41 +0000 +++ tools/cachemgr.cc 2008-03-16 22:10:18 +0000 @@ -149,9 +149,7 @@ char *user_name; char *passwd; char *pub_auth; -} - -cachemgr_request; +} cachemgr_request; /* * Debugging macros (info goes to error_log on your web server) @@ -435,9 +433,7 @@ if (strncasecmp(sline, "HTTP/", 5) || !sp) return -1; - while (xisspace(*++sp)) - - ; + while (xisspace(*++sp)); if (!xisdigit(*sp)) return -1; # Begin bundle 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