From: Henrik Nordstrom Date: Sun, 16 Mar 2008 22:10:18 +0000 (+0100) Subject: Cleanup yet another astyle artefact where struct {} members have their X-Git-Tag: BASIC_TPROXY4~15^2~5^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fadd50d40b23144a261e2f2f171d7286fbd37a2;p=thirdparty%2Fsquid.git Cleanup yet another astyle artefact where struct {} members have their name broken out on a new line. --- diff --git a/include/radix.h b/include/radix.h index c963531e86..ccfeae451f 100644 --- a/include/radix.h +++ b/include/radix.h @@ -65,9 +65,7 @@ struct squid_radix_node 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 struct squid_radix_node *rn_L; /* progeny */ struct squid_radix_node *rn_R; /* progeny */ - } - - rn_node; + } rn_node; } rn_u; #ifdef RN_DEBUG diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h index b77d2ffe78..b42b1ca0fc 100644 --- a/src/AccessLogEntry.h +++ b/src/AccessLogEntry.h @@ -62,9 +62,7 @@ public: int code; const char *content_type; HttpVersion version; - } - - http; + } http; class ICPDetails { @@ -73,9 +71,7 @@ public: ICPDetails() : opcode(ICP_INVALID) {} icp_opcode opcode; - } - - icp; + } icp; class CacheDetails { @@ -110,9 +106,7 @@ public: const char *ssluser; #endif - } - - cache; + } cache; class Headers { @@ -122,9 +116,7 @@ public: char *request; char *reply; - } - - headers; + } headers; class Private { @@ -133,9 +125,7 @@ public: Private() : method_str(NULL) {} const char *method_str; - } - - _private; + } _private; HierarchyLogEntry hier; HttpReply *reply; HttpRequest *request; diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc index 994aaf801d..a81b663f30 100644 --- a/src/CacheDigest.cc +++ b/src/CacheDigest.cc @@ -46,9 +46,7 @@ typedef struct 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); diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc index 7ba554426e..582eeb17c3 100644 --- a/src/DiskIO/DiskThreads/aiops.cc +++ b/src/DiskIO/DiskThreads/aiops.cc @@ -86,9 +86,7 @@ typedef struct squidaio_request_t struct stat *statp; squidaio_result_t *resultp; -} - -squidaio_request_t; +} squidaio_request_t; typedef struct squidaio_request_queue_t { @@ -98,9 +96,7 @@ typedef struct squidaio_request_queue_t 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; diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc index 4b9d2b1af5..ec670231f0 100755 --- a/src/DiskIO/DiskThreads/aiops_win32.cc +++ b/src/DiskIO/DiskThreads/aiops_win32.cc @@ -82,9 +82,7 @@ typedef struct squidaio_request_t struct stat *statp; squidaio_result_t *resultp; -} - -squidaio_request_t; +} squidaio_request_t; typedef struct squidaio_request_queue_t { @@ -94,9 +92,7 @@ typedef struct squidaio_request_queue_t 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; diff --git a/src/DiskIO/DiskThreads/async_io.cc b/src/DiskIO/DiskThreads/async_io.cc index 860b4c3e26..cf182b0afa 100644 --- a/src/DiskIO/DiskThreads/async_io.cc +++ b/src/DiskIO/DiskThreads/async_io.cc @@ -48,9 +48,7 @@ typedef struct squidaio_unlinkq_t char *path; struct squidaio_unlinkq_t *next; -} - -squidaio_unlinkq_t; +} squidaio_unlinkq_t; dlink_list used_list; diff --git a/src/ESI.cc b/src/ESI.cc index 145937a92b..3aa898e9b0 100644 --- a/src/ESI.cc +++ b/src/ESI.cc @@ -174,9 +174,7 @@ struct esiTry : public ESIElement int exceptok:1; /* likewise */ int attemptfailed:1; /* The attempt branch failed */ int exceptfailed:1; /* the except branch failed */ - } - - flags; + } flags; void finish(); private: diff --git a/src/ESIExpression.cc b/src/ESIExpression.cc index 1607a3eff4..beaf2832c7 100644 --- a/src/ESIExpression.cc +++ b/src/ESIExpression.cc @@ -73,8 +73,7 @@ typedef enum ESI_EXPR_MORE, ESI_EXPR_MOREEQ, ESI_EXPR_EXPR /* the result of an expr PRI 1 */ -} -evaltype; +} evaltype; typedef enum { @@ -83,8 +82,7 @@ typedef enum ESI_LITERAL_INT, ESI_LITERAL_BOOL, ESI_LITERAL_INVALID -} -literalhint; +} literalhint; struct _stackmember { @@ -94,8 +92,7 @@ struct _stackmember char *string; double floating; int integral; - } - value; + } value; literalhint valuestored; evaltype valuetype; int precedence; diff --git a/src/ICAP/ICAPModXact.h b/src/ICAP/ICAPModXact.h index ebb69e1b3a..f24473d596 100644 --- a/src/ICAP/ICAPModXact.h +++ b/src/ICAP/ICAPModXact.h @@ -300,9 +300,7 @@ private: enum Sending { sendingUndecided, sendingVirgin, sendingAdapted, sendingDone } sending; - } - - state; + } state; CBDATA_CLASS2(ICAPModXact); }; diff --git a/src/ICMPv4.h b/src/ICMPv4.h index 05c06c2603..16a118074a 100644 --- a/src/ICMPv4.h +++ b/src/ICMPv4.h @@ -112,8 +112,7 @@ u_int8_t version: 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 @@ typedef struct icmphdr 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_ */ diff --git a/src/MemObject.h b/src/MemObject.h index f00af90d9e..48b48fd5c5 100644 --- a/src/MemObject.h +++ b/src/MemObject.h @@ -126,9 +126,7 @@ public: { STABH *callback; void *data; - } - - abort; + } abort; char *log_url; RemovalPolicyNode repl; int id; diff --git a/src/StoreClient.h b/src/StoreClient.h index 3389313508..c93597e35b 100644 --- a/src/StoreClient.h +++ b/src/StoreClient.h @@ -122,9 +122,7 @@ public: bool pending() const; STCB *callback_handler; void *callback_data; - } - - _callback; + } _callback; }; SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *); diff --git a/src/StoreIOState.h b/src/StoreIOState.h index ed01ce6ecb..022be39698 100644 --- a/src/StoreIOState.h +++ b/src/StoreIOState.h @@ -99,16 +99,12 @@ public: { STRCB *callback; void *callback_data; - } - - read; + } read; struct { unsigned int closing:1; /* debugging aid */ - } - - flags; + } flags; }; StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *); diff --git a/src/SwapDir.h b/src/SwapDir.h index 23af542b5c..9c527ce470 100644 --- a/src/SwapDir.h +++ b/src/SwapDir.h @@ -174,9 +174,7 @@ public: Flags() : selected(0), read_only(0){} unsigned int selected:1; unsigned int read_only:1; - } - - flags; + } flags; virtual void init() = 0; /* Initialise the fs */ virtual void create(); /* Create a new fs */ virtual void dump(StoreEntry &)const; /* Dump fs config snippet */ @@ -216,9 +214,7 @@ public: struct { int blksize; - } - - fs; + } fs; }; #endif /* SQUID_SWAPDIR_H */ diff --git a/src/access_log.cc b/src/access_log.cc index 4d381260fa..0dd1f2995c 100644 --- a/src/access_log.cc +++ b/src/access_log.cc @@ -96,9 +96,7 @@ typedef struct { 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,9 +404,7 @@ struct _logformat_token char *header; char *element; char separator; - } - - header; + } header; char *timespec; } data; unsigned char width; diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h index 60afe76db3..c1d335d24d 100644 --- a/src/auth/basic/auth_basic.h +++ b/src/auth/basic/auth_basic.h @@ -65,9 +65,7 @@ public: unsigned int credentials_ok: 2; /*0=unchecked,1=ok,2=failed */ - } - - flags; + } flags; BasicAuthQueueNode *auth_queue; private: diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h index dd2559b5dd..e7dd02ec9a 100644 --- a/src/auth/negotiate/auth_negotiate.h +++ b/src/auth/negotiate/auth_negotiate.h @@ -39,8 +39,7 @@ typedef struct void *data; AuthUserRequest *auth_user_request; RH *handler; -} -authenticateStateData; +} authenticateStateData; #endif /// \ingroup AuthNegotiateAPI diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h index b2c01b7ced..38351a7752 100644 --- a/src/auth/ntlm/auth_ntlm.h +++ b/src/auth/ntlm/auth_ntlm.h @@ -30,9 +30,7 @@ typedef struct void *data; AuthUserRequest *auth_user_request; RH *handler; -} - -authenticateStateData; +} authenticateStateData; #endif class NTLMUser : public AuthUser diff --git a/src/cache_diff.cc b/src/cache_diff.cc index e74aa99085..95eed12418 100644 --- a/src/cache_diff.cc +++ b/src/cache_diff.cc @@ -48,9 +48,7 @@ typedef struct 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 @@ typedef struct _CacheEntry struct _CacheEntry *next; /* StoreSwapLogData s; */ unsigned char key_arr[SQUID_MD5_DIGEST_LENGTH]; -} - -CacheEntry; +} CacheEntry; /* copied from url.c */ diff --git a/src/cache_manager.cc b/src/cache_manager.cc index 9e6450322b..9ebabf9c7a 100644 --- a/src/cache_manager.cc +++ b/src/cache_manager.cc @@ -57,8 +57,7 @@ typedef struct char *action; char *user_name; char *passwd; -} -cachemgrStateData; +} cachemgrStateData; static CacheManagerAction *cachemgrFindAction(const char *action); static cachemgrStateData *cachemgrParseUrl(const char *url); diff --git a/src/cf_gen.cc b/src/cf_gen.cc index 802b8e4bb0..6cd813c47c 100644 --- a/src/cf_gen.cc +++ b/src/cf_gen.cc @@ -70,18 +70,14 @@ typedef struct Line char *data; struct Line *next; -} - -Line; +} Line; typedef struct EntryAlias { struct EntryAlias *next; char *name; -} - -EntryAlias; +} EntryAlias; typedef struct Entry { @@ -98,9 +94,7 @@ typedef struct Entry int array_flag; struct Entry *next; -} - -Entry; +} Entry; typedef struct TypeDep { diff --git a/src/client_side.h b/src/client_side.h index a314d235ef..28eb767f2d 100644 --- a/src/client_side.h +++ b/src/client_side.h @@ -74,9 +74,7 @@ public: 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 @@ public: struct { bool readMoreRequests; - } - - flags; + } flags; http_port_list *port; bool transparent() const; diff --git a/src/client_side_reply.h b/src/client_side_reply.h index a69d011106..b453e645b7 100644 --- a/src/client_side_reply.h +++ b/src/client_side_reply.h @@ -112,9 +112,7 @@ unsigned storelogiccomplete: 1; 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: diff --git a/src/dns_internal.cc b/src/dns_internal.cc index 3f280e1b49..9a9c197062 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -1144,9 +1144,7 @@ idnsRead(int fd, void *data) } else { debugs(78, 1, "WARNING: Reply from unknown nameserver " << from << " (retrying..." << (squid_curtime-last_warning) << "<=60)" ); - } - - continue; + } continue; } idnsGrokReply(rbuf, len); diff --git a/src/errorpage.cc b/src/errorpage.cc index 32dbd790de..86fed6f0fb 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -67,8 +67,7 @@ typedef struct { int id; char *page_name; -} -ErrorDynamicPageInfo; +} ErrorDynamicPageInfo; /* local constant and vars */ diff --git a/src/external_acl.cc b/src/external_acl.cc index 4e717d474a..91c2554490 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -126,9 +126,7 @@ public: { QUOTE_METHOD_SHELL = 1, QUOTE_METHOD_URL - } - - quote; + } quote; IPAddress local_addr; }; diff --git a/src/forward.h b/src/forward.h index 40dbcecf8a..d15149cb43 100644 --- a/src/forward.h +++ b/src/forward.h @@ -98,9 +98,7 @@ private: unsigned int dont_retry:1; unsigned int ftp_pasv_failed:1; unsigned int forward_completed:1; - } - - flags; + } flags; #if LINUX_NETFILTER IPAddress src; #endif diff --git a/src/fqdncache.cc b/src/fqdncache.cc index 58c391436e..ea3c13c26b 100644 --- a/src/fqdncache.cc +++ b/src/fqdncache.cc @@ -112,9 +112,7 @@ struct _fqdncache_entry { unsigned int negcached:1; unsigned int fromhosts:1; - } - - flags; + } flags; }; /// \ingroup FQDNCacheInternal @@ -125,8 +123,7 @@ static struct _fqdn_cache_stats int hits; int misses; int negative_hits; -} -FqdncacheStats; +} FqdncacheStats; /// \ingroup FQDNCacheInternal static dlink_list lru_list; diff --git a/src/fs/coss/StoreFScoss.h b/src/fs/coss/StoreFScoss.h index fdf7feaf50..927e71c40e 100644 --- a/src/fs/coss/StoreFScoss.h +++ b/src/fs/coss/StoreFScoss.h @@ -54,9 +54,7 @@ public: int alloc; int realloc; int collisions; - } - - alloc; + } alloc; int disk_overflows; int stripe_overflows; int open_mem_hits; diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc index 0a966a3b0c..e44a05f9be 100644 --- a/src/fs/coss/store_dir_coss.cc +++ b/src/fs/coss/store_dir_coss.cc @@ -444,9 +444,7 @@ storeCossRebuildFromSwapLog(void *data) 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); diff --git a/src/fs/ufs/ufscommon.cc b/src/fs/ufs/ufscommon.cc index fa47c99c53..11d0abd5ce 100644 --- a/src/fs/ufs/ufscommon.cc +++ b/src/fs/ufs/ufscommon.cc @@ -535,9 +535,7 @@ RebuildState::rebuildFromSwapLog() currentEntry()->release(); counts.objcount--; counts.cancelcount++; - } - - continue; + } continue; } else { x = ::log(static_cast(++counts.bad_log_op)) / ::log(10.0); @@ -604,9 +602,7 @@ RebuildState::rebuildFromSwapLog() } 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 diff --git a/src/fs/ufs/ufscommon.h b/src/fs/ufs/ufscommon.h index 0d1b96d227..8f6444aac1 100644 --- a/src/fs/ufs/ufscommon.h +++ b/src/fs/ufs/ufscommon.h @@ -274,9 +274,7 @@ protected: * 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 *); diff --git a/src/ftp.cc b/src/ftp.cc index db7c9b9635..9a6b414737 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -169,9 +169,7 @@ public: char *last_command; char *last_reply; int replycode; - } - - ctrl; + } ctrl; struct { @@ -180,9 +178,7 @@ public: char *host; u_short port; bool read_pending; - } - - data; + } data; struct _ftp_flags flags; @@ -274,8 +270,7 @@ typedef struct char *name; char *showname; char *link; -} -ftpListParts; +} ftpListParts; /// \ingroup ServerProtocolFTPInternal #define FTP_LOGIN_ESCAPED 1 diff --git a/src/gopher.cc b/src/gopher.cc index 9fdd3995be..24ebff5e1c 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -136,9 +136,7 @@ typedef struct gopher_ds 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); diff --git a/src/helper.h b/src/helper.h index 75e2f4842b..cc08c45d31 100644 --- a/src/helper.h +++ b/src/helper.h @@ -77,9 +77,7 @@ struct _helper int replies; int queue_size; int avg_svc_time; - } - - stats; + } stats; }; struct _helper_stateful @@ -105,9 +103,7 @@ struct _helper_stateful int replies; int queue_size; int avg_svc_time; - } - - stats; + } stats; }; struct _helper_server diff --git a/src/htcp.h b/src/htcp.h index 2d2d9927c1..09dff47119 100644 --- a/src/htcp.h +++ b/src/htcp.h @@ -54,9 +54,7 @@ public: double rtt; int samp; int hops; - } - - cto; + } cto; }; /// \bug redundant typedef diff --git a/src/ident.cc b/src/ident.cc index ac7f1b52d6..d7acd6fab0 100644 --- a/src/ident.cc +++ b/src/ident.cc @@ -46,9 +46,7 @@ typedef struct _IdentClient void *callback_data; struct _IdentClient *next; -} - -IdentClient; +} IdentClient; typedef struct _IdentStateData { @@ -60,9 +58,7 @@ typedef struct _IdentStateData IPAddress my_peer; IdentClient *clients; char buf[4096]; -} - -IdentStateData; +} IdentStateData; static IOCB identReadReply; static PF identClose; diff --git a/src/ipcache.cc b/src/ipcache.cc index fc56b985ba..d849863134 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -112,9 +112,7 @@ struct _ipcache_entry { unsigned int negcached:1; unsigned int fromhosts:1; - } - - flags; + } flags; }; /// \ingroup IPCacheInternal @@ -131,8 +129,7 @@ static struct _ipcache_stats int rr_cname; int cname_only; int invalid; -} -IpcacheStats; +} IpcacheStats; /// \ingroup IPCacheInternal static dlink_list lru_list; diff --git a/src/net_db.cc b/src/net_db.cc index 3ce6f28e4c..434193d121 100644 --- a/src/net_db.cc +++ b/src/net_db.cc @@ -78,9 +78,7 @@ typedef struct 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; diff --git a/src/peer_select.cc b/src/peer_select.cc index cb1904f608..cc9cc22142 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -73,9 +73,7 @@ const char *hier_strings[] = static struct { int timeouts; -} - -PeerStats; +} PeerStats; static const char *DirectStr[] = { diff --git a/src/redirect.cc b/src/redirect.cc index b8880f15d5..db8e6902d8 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -53,9 +53,7 @@ typedef struct const char *client_ident; const char *method_s; RH *handler; -} - -redirectStateData; +} redirectStateData; static HLPCB redirectHandleReply; static void redirectStateFree(redirectStateData * r); diff --git a/src/refresh.cc b/src/refresh.cc index 343c47c604..13fc7e1af3 100644 --- a/src/refresh.cc +++ b/src/refresh.cc @@ -64,9 +64,7 @@ typedef struct bool min; bool lmfactor; bool max; -} - -stale_flags; +} stale_flags; /* * This enumerated list assigns specific values, ala HTTP/FTP status diff --git a/src/store.cc b/src/store.cc index 634966da48..b3128915ee 100644 --- a/src/store.cc +++ b/src/store.cc @@ -905,19 +905,13 @@ struct _store_check_cachable_hist 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) diff --git a/src/store_digest.cc b/src/store_digest.cc index 45bdda3d40..754ab77cba 100644 --- a/src/store_digest.cc +++ b/src/store_digest.cc @@ -79,9 +79,7 @@ typedef struct 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; diff --git a/src/store_io.cc b/src/store_io.cc index 64d30c2b0c..db0cfc0e17 100644 --- a/src/store_io.cc +++ b/src/store_io.cc @@ -12,12 +12,8 @@ static struct int select_fail; int create_fail; int success; - } - - create; -} - -store_io_stats; + } create; +} store_io_stats; OBJH storeIOStats; diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index dd8f6df30c..0778cc7482 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -51,9 +51,7 @@ typedef struct int total; /* number of entries read so far */ int scanned; -} - -store_rebuild_progress; +} store_rebuild_progress; static store_rebuild_progress *RebuildProgress = NULL; diff --git a/src/structs.h b/src/structs.h index ba12390e22..8d963675c8 100644 --- a/src/structs.h +++ b/src/structs.h @@ -255,9 +255,7 @@ struct _SquidConfig int weight; int rebuildwait; void *info; - } - - Wccp2; + } Wccp2; #endif #if USE_ICMP @@ -289,9 +287,7 @@ struct _SquidConfig customlog *accesslogs; int rotateNumber; - } - - Log; + } Log; char *adminEmail; char *EmailFrom; char *EmailProgram; @@ -317,9 +313,7 @@ struct _SquidConfig char *ssl_password; #endif - } - - Program; + } Program; #if USE_DNSSERVERS int dnsChildren; @@ -337,9 +331,7 @@ struct _SquidConfig char *surrogate_id; #endif - } - - Accel; + } Accel; char *appendDomain; size_t appendDomainLen; char *debugOptions; @@ -358,9 +350,7 @@ struct _SquidConfig char *file; time_t period; u_short port; - } - - Announce; + } Announce; struct { @@ -376,9 +366,7 @@ struct _SquidConfig #endif /* FIXME INET6 : this should really be a CIDR value */ IPAddress client_netmask; - } - - Addrs; + } Addrs; size_t tcpRcvBufsz; size_t udpMaxHitObjsz; wordlist *hierarchy_stoplist; @@ -393,16 +381,12 @@ struct _SquidConfig int size; int low; int high; - } - - ipcache; + } ipcache; struct { int size; - } - - fqdncache; + } fqdncache; int minDirectHops; int minDirectRtt; cachemgr_passwd *passwd_list; @@ -414,18 +398,14 @@ struct _SquidConfig int64_t maxObjectSize; int64_t minObjectSize; size_t maxInMemObjSize; - } - - Store; + } Store; struct { int high; int low; time_t period; - } - - Netdb; + } Netdb; struct { @@ -485,9 +465,7 @@ struct _SquidConfig int global_internal_static; int dns_require_A; int debug_override_X; - } - - onoff; + } onoff; class ACL *aclList; @@ -527,9 +505,7 @@ struct _SquidConfig acl_access *ssl_bump; #endif - } - - accessList; + } accessList; acl_deny_info_list *denyInfoList; authConfig authConfiguration; @@ -542,9 +518,7 @@ struct _SquidConfig int epsv_all; int sanitycheck; int telnet; - } - - Ftp; + } Ftp; refresh_t *Refresh; struct _cacheSwap @@ -552,33 +526,25 @@ struct _SquidConfig 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; @@ -592,9 +558,7 @@ struct _SquidConfig 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; @@ -607,9 +571,7 @@ struct _SquidConfig int ttl; unsigned short port; char *encode_key; - } - - mcast_miss; + } mcast_miss; #endif /* one access list per header type we know of */ @@ -627,9 +589,7 @@ struct _SquidConfig time_t rewrite_period; size_t swapout_chunk_size; int rebuild_chunk_percentage; - } - - digest; + } digest; #endif #if USE_SSL @@ -637,9 +597,7 @@ struct _SquidConfig { int unclean_shutdown; char *ssl_engine; - } - - SSL; + } SSL; #endif wordlist *ext_methods; @@ -649,9 +607,7 @@ struct _SquidConfig 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 */ @@ -671,9 +627,7 @@ struct _SquidConfig char *flags; acl_access *cert_error; SSL_CTX *sslContext; - } - - ssl_client; + } ssl_client; #endif char *accept_filter; @@ -686,9 +640,7 @@ struct _SquidConfig2 { int enable_purge; int mangle_request_headers; - } - - onoff; + } onoff; uid_t effectiveUserID; gid_t effectiveGroupID; }; @@ -904,18 +856,14 @@ struct _peer 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 @@ -923,9 +871,7 @@ struct _peer double version; int counts[2]; u_short port; - } - - htcp; + } htcp; #endif u_short http_port; @@ -997,9 +943,7 @@ struct _peer unsigned int hash; double load_multiplier; double load_factor; /* normalized weight value */ - } - - carp; + } carp; #endif char *login; /* Proxy authorization */ @@ -1245,9 +1189,7 @@ struct _StatCounters StatHist reply_svc_time; int query_timeouts; int times_used; - } - - icp; + } icp; struct { diff --git a/src/test_cache_digest.cc b/src/test_cache_digest.cc index 3b15ab7ca1..b51301f041 100644 --- a/src/test_cache_digest.cc +++ b/src/test_cache_digest.cc @@ -45,9 +45,7 @@ typedef struct int true_miss_count; int false_hit_count; int false_miss_count; -} - -CacheQueryStats; +} CacheQueryStats; typedef struct _Cache Cache; @@ -72,9 +70,7 @@ typedef struct _CacheEntry struct _CacheEntry *next; unsigned char key_arr[SQUID_MD5_DIGEST_LENGTH]; /* storeSwapLogData s; */ -} - -CacheEntry; +} CacheEntry; /* parsed access log entry */ @@ -83,9 +79,7 @@ typedef struct 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 diff --git a/src/typedefs.h b/src/typedefs.h index a2135677dc..57b7161be3 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -46,9 +46,7 @@ typedef struct { size_t bytes; size_t kb; -} - -kb_t; +} kb_t; typedef struct _acl_time_data acl_time_data; diff --git a/src/urn.cc b/src/urn.cc index 218d4933e2..ad5f74012f 100644 --- a/src/urn.cc +++ b/src/urn.cc @@ -88,12 +88,8 @@ typedef struct struct { int cached; - } - - flags; -} - -url_entry; + } flags; +} url_entry; static STCB urnHandleReply; static url_entry *urnParseReply(const char *inbuf, const HttpRequestMethod&); diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc index 1704194b95..4ad72dd056 100644 --- a/tools/cachemgr.cc +++ b/tools/cachemgr.cc @@ -149,9 +149,7 @@ typedef struct char *user_name; char *passwd; char *pub_auth; -} - -cachemgr_request; +} cachemgr_request; /* * Debugging macros (info goes to error_log on your web server)