Changed some structs to classes.

diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index 2d44bf42d69fa2625a483985b3967da40f988819..76d91abb7a9547600e6be32a7c94d3592d0e3054 100644 (file)
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -36,6 +36,7 @@
 #include "typedefs.h"
 class CacheDigestGuessStats;
 class StoreEntry;
+class CacheDigest;
 
 extern CacheDigest *cacheDigestCreate(int capacity, int bpe);
 extern void cacheDigestDestroy(CacheDigest * cd);

diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index ff1be34f016bc4e9d650bb322513207c266e745b..f0d09a87aa88d5dabd115a37af5f84924e3ff0ab 100644 (file)
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -178,7 +178,8 @@ typedef enum {
     hoEnd
 } http_hdr_owner_type;
 
-struct _HttpHeaderFieldAttrs {
+class HttpHeaderFieldAttrs {
+public:
     const char *name;
     http_hdr_type id;
     field_type type;

diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h
index f6a051d589b394083c1e9ab20ab4af483519a3a1..b79b257199870af335943a737e2b3d2de35f62e0 100644 (file)
--- a/src/HttpHeaderTools.h
+++ b/src/HttpHeaderTools.h
@@ -19,11 +19,11 @@ class HeaderWithAcl;
 typedef std::list<HeaderWithAcl> HeaderWithAclList;
 
 class acl_access;
-struct _header_mangler {
+class header_mangler {
+public:
     acl_access *access_list;
     char *replacement;
 };
-typedef struct _header_mangler header_mangler;
 
 class StoreEntry;
 

diff --git a/src/ICP.h b/src/ICP.h
index fe6481df3e9bcdbf01939be036a39a5cf4815fef..92591220f487a3709b9e35b7de47073497e34602 100644 (file)
--- a/src/ICP.h
+++ b/src/ICP.h
@@ -76,6 +76,8 @@ struct _icp_common_t {
     icp_opcode getOpCode() const;
 #endif
 };
+typedef struct _icp_common_t icp_common_t;
+
 
 #ifdef __cplusplus
 

diff --git a/src/neighbors.h b/src/neighbors.h
index f62195ad09e51d6ee2bbc49b09cab2ff79385ef8..7ef71a6f71059186a10f008a4ca4588f5535fe70 100644 (file)
--- a/src/neighbors.h
+++ b/src/neighbors.h
@@ -34,54 +34,53 @@
 #define SQUID_NEIGHBORS_H_
 
 #include "enums.h"
-#include "HttpRequestMethod.h"
+#include "ICP.h"
 #include "lookup_t.h"
-#include "ip/Address.h"
-#include "typedefs.h"
 
 class HttpRequest;
+class HttpRequestMethod;
 class peer;
 class StoreEntry;
 
-SQUIDCEXTERN peer *getFirstPeer(void);
-SQUIDCEXTERN peer *getFirstUpParent(HttpRequest *);
-SQUIDCEXTERN peer *getNextPeer(peer *);
-SQUIDCEXTERN peer *getSingleParent(HttpRequest *);
-SQUIDCEXTERN int neighborsCount(HttpRequest *);
-SQUIDCEXTERN int neighborsUdpPing(HttpRequest *,
+extern peer *getFirstPeer(void);
+extern peer *getFirstUpParent(HttpRequest *);
+extern peer *getNextPeer(peer *);
+extern peer *getSingleParent(HttpRequest *);
+extern int neighborsCount(HttpRequest *);
+extern int neighborsUdpPing(HttpRequest *,
                                   StoreEntry *,
                                   IRCB * callback,
                                   void *data,
                                   int *exprep,
                                   int *timeout);
-SQUIDCEXTERN void neighborAddAcl(const char *, const char *);
+extern void neighborAddAcl(const char *, const char *);
 
-SQUIDCEXTERN void neighborsUdpAck(const cache_key *, icp_common_t *, const Ip::Address &);
-SQUIDCEXTERN void neighborAdd(const char *, const char *, int, int, int, int, int);
-SQUIDCEXTERN void neighbors_init(void);
+extern void neighborsUdpAck(const cache_key *, icp_common_t *, const Ip::Address &);
+extern void neighborAdd(const char *, const char *, int, int, int, int, int);
+extern void neighbors_init(void);
 #if USE_HTCP
-SQUIDCEXTERN void neighborsHtcpClear(StoreEntry *, const char *, HttpRequest *, const HttpRequestMethod &, htcp_clr_reason);
+extern void neighborsHtcpClear(StoreEntry *, const char *, HttpRequest *, const HttpRequestMethod &, htcp_clr_reason);
 #endif
-SQUIDCEXTERN peer *peerFindByName(const char *);
-SQUIDCEXTERN peer *peerFindByNameAndPort(const char *, unsigned short);
-SQUIDCEXTERN peer *getDefaultParent(HttpRequest * request);
-SQUIDCEXTERN peer *getRoundRobinParent(HttpRequest * request);
-SQUIDCEXTERN peer *getWeightedRoundRobinParent(HttpRequest * request);
-SQUIDCEXTERN void peerClearRRStart(void);
-SQUIDCEXTERN void peerClearRR(void);
-SQUIDCEXTERN lookup_t peerDigestLookup(peer * p, HttpRequest * request);
-SQUIDCEXTERN peer *neighborsDigestSelect(HttpRequest * request);
-SQUIDCEXTERN void peerNoteDigestLookup(HttpRequest * request, peer * p, lookup_t lookup);
-SQUIDCEXTERN void peerNoteDigestGone(peer * p);
-SQUIDCEXTERN int neighborUp(const peer * e);
-SQUIDCEXTERN CBDUNL peerDestroy;
-SQUIDCEXTERN const char *neighborTypeStr(const peer * e);
-SQUIDCEXTERN peer_t neighborType(const peer *, const HttpRequest *);
-SQUIDCEXTERN void peerConnectFailed(peer *);
-SQUIDCEXTERN void peerConnectSucceded(peer *);
-SQUIDCEXTERN void dump_peer_options(StoreEntry *, peer *);
-SQUIDCEXTERN int peerHTTPOkay(const peer *, HttpRequest *);
+extern peer *peerFindByName(const char *);
+extern peer *peerFindByNameAndPort(const char *, unsigned short);
+extern peer *getDefaultParent(HttpRequest * request);
+extern peer *getRoundRobinParent(HttpRequest * request);
+extern peer *getWeightedRoundRobinParent(HttpRequest * request);
+extern void peerClearRRStart(void);
+extern void peerClearRR(void);
+extern lookup_t peerDigestLookup(peer * p, HttpRequest * request);
+extern peer *neighborsDigestSelect(HttpRequest * request);
+extern void peerNoteDigestLookup(HttpRequest * request, peer * p, lookup_t lookup);
+extern void peerNoteDigestGone(peer * p);
+extern int neighborUp(const peer * e);
+extern CBDUNL peerDestroy;
+extern const char *neighborTypeStr(const peer * e);
+extern peer_t neighborType(const peer *, const HttpRequest *);
+extern void peerConnectFailed(peer *);
+extern void peerConnectSucceded(peer *);
+extern void dump_peer_options(StoreEntry *, peer *);
+extern int peerHTTPOkay(const peer *, HttpRequest *);
 
-SQUIDCEXTERN peer *whichPeer(const Ip::Address &from);
+extern peer *whichPeer(const Ip::Address &from);
 
 #endif /* SQUID_NEIGHBORS_H_ */

diff --git a/src/structs.h b/src/structs.h
index 1509abb4d4b7e77cbf8ebe6a5b970a90b99b6897..7e473ac3680c5855ef4a1c86446a23662fde0282 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -137,6 +137,9 @@ class CpuAffinityMap;
 class RemovalPolicySettings;
 class external_acl;
 class Store;
+class customlog;
+class cachemgr_passwd;
+class refresh_t;
 namespace AnyP
 {
 struct PortCfg;
@@ -1039,13 +1042,15 @@ private:
 };
 
 
-struct _cachemgr_passwd {
+class cachemgr_passwd {
+public:
     char *passwd;
     wordlist *actions;
     cachemgr_passwd *next;
 };
 
-struct _refresh_t {
+class refresh_t {
+public:
     const char *pattern;
     regex_t compiled_pattern;
     time_t min;
@@ -1072,7 +1077,8 @@ struct _refresh_t {
     int max_stale;
 };
 
-struct _CacheDigest {
+class CacheDigest {
+public:
     /* public, read-only */
     char *mask;                        /* bit mask */
     int mask_size;             /* mask size in bytes */
@@ -1114,7 +1120,8 @@ class Logfile;
 
 #include "format/Format.h"
 #include "log/Formats.h"
-struct _customlog {
+class customlog {
+public:
     char *filename;
     ACLList *aclList;
     Format::Format *logFormat;

diff --git a/src/typedefs.h b/src/typedefs.h
index da64b8b3586d47500d80b7c3e4d6f3752436227b..fd2d21b43827dd26a5c00ec46baef2a22b8e9987 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -45,27 +45,8 @@ typedef struct {
     size_t kb;
 } kb_t;
 
-typedef struct _HttpHeaderFieldAttrs HttpHeaderFieldAttrs;
-
-typedef struct _icp_common_t icp_common_t;
-
-typedef struct _header_mangler header_mangler;
-
-typedef struct _cachemgr_passwd cachemgr_passwd;
-
-typedef struct _refresh_t refresh_t;
-
 typedef struct _CommWriteStateData CommWriteStateData;
 
-typedef struct _storeSwapLogData storeSwapLogData;
-
-typedef struct _CacheDigest CacheDigest;
-
-typedef struct _Version Version;
-
-
-typedef struct _customlog customlog;
-
 #if USE_SSL
 typedef struct _sslproxy_cert_sign sslproxy_cert_sign;