From: Amos Jeffries Date: Sat, 11 Jan 2014 01:35:50 +0000 (-0800) Subject: Docs: fix various doxygen compiler issues X-Git-Tag: SQUID_3_5_0_1~425 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6d0eb1173bfd2c6c8b2e30cb09542fa0851aace;p=thirdparty%2Fsquid.git Docs: fix various doxygen compiler issues --- diff --git a/compat/compat.dox b/compat/compat.dox index d9af22df68..29e75f3fdd 100644 --- a/compat/compat.dox +++ b/compat/compat.dox @@ -4,7 +4,7 @@ \title Squid Portability -\section 1 Aim +\section sec1 Aim \par Squid aims to build and run on many modern systems. To do this we have traditionally @@ -18,7 +18,7 @@ The Portability library libcompat-squid.la has been created to correct the three stable build portability, code cleanliness, and clearer licensing. -\section 2 Requirements +\section sec2 Requirements \par The system calls used by Squid are not required to be standard. Often we depend on @@ -26,17 +26,17 @@ some non-standard call which can give great performance benefits. But they are required to meet several other criteria: \li They must be of actual benefit to Squid during its operation. \li A better alternative must not exist. - \li If not available on all OS an open-source GPLv2+ implementation must be available - to be included with the Squid sources and used when required. + \li If not available on all OS an open-source GPLv2+ compatible implementation must be + available to be included with the Squid sources and used when required. \par -To be built into the libcompat-squid.la as a layer below all Squid-bundled binaries. The code -must also qualify by being provided natively by some OS where Squid builds. \br +To be built into the libcompat-squid.la as a layer below all Squid-bundled binaries. The +code must also qualify by being provided natively by some OS where Squid builds. \br Code and Algorithms which do not meet this final criteria are relegated to the slightly higher level of basic component, rather than portability. -\section 3 Component Types +\section sec3 Component Types \par Macro re-definition Where the only difference between systems is their naming scheme. One of the schemes is @@ -62,16 +62,16 @@ same name with an 'x' pre-pended. Currently these extra protections are added on handling and memory allocation. -\section 4 Layout +\section sec4 Layout The internal code structure of libcompat-squid.la files has a hierarchy. The API has a flat global scope separate from the file layout. The API is pulled in by including compat/compat.h. -The strict dependency requirements which exist within the compat API make including +The strict dependency requirements which exist within the compat API make including an individual part separately a risky operation. \par -Squid coding guidelines require each .c and .cc file to include squid.h first -in their included files. squid.h begin with an order-specific sequence of defines and -includes compat/compat.h to incorporate the compat layer appropriately in every soure file. +Squid coding guidelines require each .c and .cc file to include squid.h first in their +included files. squid.h begins with an order-specific sequence of defines and includes +compat/compat.h to incorporate the compat layer appropriately in every source file. \par Internally the compat/ directory contains the public API file compat/compat.h which structures @@ -84,9 +84,9 @@ special compat layer handling. Hacks for specific systems should be restricted t as much as possible. \par -compat/compat_shared.h file contains the shared portability definitions which are shared -across a great many systems. These should be written with protective macros to prevent any -symbols or code being defined which is not necessary. Protections here must not be system-specific. +compat/compat_shared.h file contains the portability definitions which are shared across a +great many systems. These should be written with protective macros to prevent any symbols or +code being defined which is not necessary. Protections here must not be system-specific. \par Also in compat/ directory are the .h and .c files for emulators detected by autoconf. These diff --git a/include/CbDataList.h b/include/CbDataList.h index 97ff706fe3..822fa303f6 100644 --- a/include/CbDataList.h +++ b/include/CbDataList.h @@ -95,7 +95,7 @@ private: /* implementation follows */ -/** \cond AUTODOCS-IGNORE */ +/** \cond AUTODOCS_IGNORE */ template cbdata_type CbDataList::CBDATA_CbDataList = CBDATA_UNKNOWN; /** \endcond */ diff --git a/squid3.dox b/squid3.dox index bea99b3bc5..bb2e735027 100644 --- a/squid3.dox +++ b/squid3.dox @@ -1262,6 +1262,7 @@ PREDEFINED = __cplusplus \ X_ACCELERATOR_VARY \ USE_ARP_ACL \ USE_ASYNC_IO \ + USE_AUTH \ USE_CACHE_DIGESTS \ USE_CLASSFUL \ USE_DELAY_POOLS \ @@ -1303,8 +1304,14 @@ EXPAND_AS_DEFINED = AsyncCallWrapper \ AsyncCallEnter \ AsyncCallExit \ CBDATA_CLASS2 \ + CBDATA_CLASS_INIT \ + CBDATA_NAMESPACED_CLASS_INIT \ MEMPROXY_CLASS_INLINE \ - MEMPROXY_CLASS + MEMPROXY_CLASS \ + MEMPROXY_CLASS_INIT \ + STUB \ + STUB_NOP \ + STUB_RETVAL # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then # doxygen's preprocessor will remove all function-like macros that are alone diff --git a/src/CommCalls.h b/src/CommCalls.h index 9ec9f4ff66..dba72d1554 100644 --- a/src/CommCalls.h +++ b/src/CommCalls.h @@ -66,13 +66,13 @@ public: void *data; // cbdata-protected /** The connection which this call pertains to. - * \itemize On accept() calls this is the new client connection. - * \itemize On connect() finished calls this is the newely opened connection. - * \itemize On write calls this is the connection just written to. - * \itemize On read calls this is the connection just read from. - * \itemize On close calls this describes the connection which is now closed. - * \itemize On timeouts this is the connection whose operation timed out. - * NP: timeouts might also return to the connect/read/write handler with COMM_ERR_TIMEOUT. + * - On accept() calls this is the new client connection. + * - On connect() finished calls this is the newely opened connection. + * - On write calls this is the connection just written to. + * - On read calls this is the connection just read from. + * - On close calls this describes the connection which is now closed. + * - On timeouts this is the connection whose operation timed out. + * + NP: timeouts might also return to the connect/read/write handler with COMM_ERR_TIMEOUT. */ Comm::ConnectionPointer conn; diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc index 660391a970..fe7a59c286 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc @@ -350,7 +350,7 @@ DiskThreadsDiskFile::writeDone(int rvfd, int errflag, size_t len, RefCount cbdata_type IoResult::CBDATA_IoResult = CBDATA_UNKNOWN; /** \endcond */ diff --git a/src/HttpParser.h b/src/HttpParser.h index 7e941528db..095d3466c7 100644 --- a/src/HttpParser.h +++ b/src/HttpParser.h @@ -11,9 +11,8 @@ * * Works on a raw character I/O buffer and tokenizes the content into * either an error state or, an HTTP procotol request major segments: - * - * \item Request Line (method, URL, protocol, version) - * \item Mime header block + * 1. Request Line (method, URL, protocol, version) + * 2. Mime header block */ class HttpParser { diff --git a/src/acl/Acl.h b/src/acl/Acl.h index 9bcdc16833..bef60f7dfb 100644 --- a/src/acl/Acl.h +++ b/src/acl/Acl.h @@ -101,10 +101,10 @@ public: void *operator new(size_t); void operator delete(void *); - static ACL *Factory (char const *); + static ACL *Factory(char const *); static void ParseAclLine(ConfigParser &parser, ACL ** head); static void Initialize(); - static ACL* FindByName(const char *name); + static ACL *FindByName(const char *name); ACL(); explicit ACL(const ACLFlag flgs[]) : cfgline(NULL), next(NULL), flags(flgs) { memset(name, '\0', sizeof(name)); } @@ -119,15 +119,15 @@ public: /// Updates the checklist state on match, async, and failure. bool matches(ACLChecklist *checklist) const; - virtual ACL *clone()const = 0; + virtual ACL *clone() const = 0; /// parses node represenation in squid.conf; dies on failures virtual void parse() = 0; virtual char const *typeString() const = 0; virtual bool isProxyAuth() const; virtual wordlist *dump() const = 0; - virtual bool empty () const = 0; - virtual bool valid () const; + virtual bool empty() const = 0; + virtual bool valid() const; int cacheMatchAcl(dlink_list * cache, ACLChecklist *); virtual int matchForCache(ACLChecklist *checklist); @@ -146,14 +146,14 @@ public: { public: - Prototype (); - Prototype (ACL const *, char const *); + Prototype(); + Prototype(ACL const *, char const *); ~Prototype(); static bool Registered(char const *); - static ACL *Factory (char const *); + static ACL *Factory(char const *); private: - ACL const*prototype; + ACL const *prototype; char const *typeString; private: diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc index 33062e8aba..bea2a9ab8c 100644 --- a/src/acl/Asn.cc +++ b/src/acl/Asn.cc @@ -75,7 +75,7 @@ struct squid_radix_node_head *AS_tree_head; /* explicit instantiation required for some systems */ -/// \cond AUTODOCS-IGNORE +/// \cond AUTODOCS_IGNORE template cbdata_type CbDataList::CBDATA_CbDataList; /// \endcond diff --git a/src/acl/InnerNode.cc b/src/acl/InnerNode.cc index c8042ecc5e..b8bc27c7c4 100644 --- a/src/acl/InnerNode.cc +++ b/src/acl/InnerNode.cc @@ -80,7 +80,7 @@ Acl::InnerNode::match(ACLChecklist *checklist) } bool -Acl::InnerNode::resumeMatchingAt(ACLChecklist *checklist, Nodes::const_iterator pos) const +Acl::InnerNode::resumeMatchingAt(ACLChecklist *checklist, Acl::Nodes::const_iterator pos) const { debugs(28, 5, "checking " << name << " at " << (pos-nodes.begin())); const int result = doMatch(checklist, pos); diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc index 40eeb67f14..1e4c1a453e 100644 --- a/src/acl/IntRange.cc +++ b/src/acl/IntRange.cc @@ -40,7 +40,7 @@ #include "wordlist.h" /* explicit instantiation required for some systems */ -/** \cond AUTODOCS-IGNORE */ +/** \cond AUTODOCS_IGNORE */ template cbdata_type CbDataList< Range >::CBDATA_CbDataList; /** \endcond */ diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc index b9a8fefd8a..3b4e294657 100644 --- a/src/acl/MethodData.cc +++ b/src/acl/MethodData.cc @@ -64,7 +64,7 @@ ACLMethodData::match(HttpRequestMethod toFind) /* explicit instantiation required for some systems */ -/// \cond AUTODOCS-IGNORE +/// \cond AUTODOCS_IGNORE template cbdata_type CbDataList::CBDATA_CbDataList; /// \endcond diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc index dc2a453a2b..f0b6899a9c 100644 --- a/src/acl/ProtocolData.cc +++ b/src/acl/ProtocolData.cc @@ -62,7 +62,7 @@ ACLProtocolData::match(AnyP::ProtocolType toFind) /* explicit instantiation required for some systems */ -/// \cond AUTODOCS-IGNORE +/// \cond AUTODOCS_IGNORE template cbdata_type CbDataList::CBDATA_CbDataList; /// \endcond diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc index 4ac522228d..e71ffb157a 100644 --- a/src/acl/SslErrorData.cc +++ b/src/acl/SslErrorData.cc @@ -62,7 +62,7 @@ ACLSslErrorData::match(const Ssl::CertErrors *toFind) } /* explicit instantiation required for some systems */ -/** \cond AUTODOCS-IGNORE */ +/** \cond AUTODOCS_IGNORE */ // AYJ: 2009-05-20 : Removing. clashes with template instantiation for other ACLs. // template cbdata_type Ssl::Errors::CBDATA_CbDataList; /** \endcond */ diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc index 10cd0fb917..3e50fc67c8 100644 --- a/src/adaptation/AccessCheck.cc +++ b/src/adaptation/AccessCheck.cc @@ -14,7 +14,7 @@ #include "HttpReply.h" #include "HttpRequest.h" -/** \cond AUTODOCS-IGNORE */ +/** \cond AUTODOCS_IGNORE */ cbdata_type Adaptation::AccessCheck::CBDATA_AccessCheck = CBDATA_UNKNOWN; /** \endcond */ diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 59502373a4..16b86f030b 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -711,7 +711,7 @@ bool Adaptation::Icap::ServiceRep::detached() const return isDetached; } -Adaptation::Icap::ConnWaiterDialer::ConnWaiterDialer(const CbcPointer &xact, +Adaptation::Icap::ConnWaiterDialer::ConnWaiterDialer(const CbcPointer &xact, Adaptation::Icap::ConnWaiterDialer::Parent::Method aHandler): Parent(xact, aHandler) { diff --git a/src/adaptation/icap/ServiceRep.h b/src/adaptation/icap/ServiceRep.h index 7097198fc6..fad4d76eac 100644 --- a/src/adaptation/icap/ServiceRep.h +++ b/src/adaptation/icap/ServiceRep.h @@ -216,7 +216,7 @@ class ConnWaiterDialer: public NullaryMemFunT public: typedef NullaryMemFunT Parent; ServiceRep::Pointer theService; - ConnWaiterDialer(const CbcPointer &xact, Parent::Method aHandler); + ConnWaiterDialer(const CbcPointer &xact, Adaptation::Icap::ConnWaiterDialer::Parent::Method aHandler); ConnWaiterDialer(const Adaptation::Icap::ConnWaiterDialer &aConnWaiter); ~ConnWaiterDialer(); }; diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc index e1023d91e0..43af041f2c 100644 --- a/src/auth/AclMaxUserIp.cc +++ b/src/auth/AclMaxUserIp.cc @@ -13,19 +13,17 @@ #include "Parsing.h" #include "wordlist.h" -ACLFlag -ACLMaxUserIP::SupportedFlags[] = {ACL_F_STRICT, ACL_F_END}; +ACLFlag ACLMaxUserIP::SupportedFlags[] = {ACL_F_STRICT, ACL_F_END}; -ACL * -ACLMaxUserIP::clone() const -{ - return new ACLMaxUserIP(*this); -} - -ACLMaxUserIP::ACLMaxUserIP (char const *theClass) : ACL(SupportedFlags), class_ (theClass), maximum(0) +ACLMaxUserIP::ACLMaxUserIP(char const *theClass) : + ACL(SupportedFlags), + class_(theClass), + maximum(0) {} -ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) : class_ (old.class_), maximum (old.maximum) +ACLMaxUserIP::ACLMaxUserIP(ACLMaxUserIP const &old) : + class_(old.class_), + maximum(old.maximum) { flags = old.flags; } @@ -33,6 +31,12 @@ ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) : class_ (old.class_), max ACLMaxUserIP::~ACLMaxUserIP() {} +ACL * +ACLMaxUserIP::clone() const +{ + return new ACLMaxUserIP(*this); +} + char const * ACLMaxUserIP::typeString() const { @@ -40,13 +44,13 @@ ACLMaxUserIP::typeString() const } bool -ACLMaxUserIP::empty () const +ACLMaxUserIP::empty() const { return false; } bool -ACLMaxUserIP::valid () const +ACLMaxUserIP::valid() const { return maximum > 0; } diff --git a/src/auth/AclMaxUserIp.h b/src/auth/AclMaxUserIp.h index 13414edfe1..58ae3fd22e 100644 --- a/src/auth/AclMaxUserIp.h +++ b/src/auth/AclMaxUserIp.h @@ -42,22 +42,21 @@ /// \ingroup ACLAPI class ACLMaxUserIP : public ACL { - public: MEMPROXY_CLASS(ACLMaxUserIP); - ACLMaxUserIP(char const *); - ACLMaxUserIP(ACLMaxUserIP const &); + ACLMaxUserIP(char const *theClass); + ACLMaxUserIP(ACLMaxUserIP const &old); ~ACLMaxUserIP(); - ACLMaxUserIP&operator=(ACLMaxUserIP const &); + ACLMaxUserIP &operator =(ACLMaxUserIP const &); - virtual ACL *clone()const; + virtual ACL *clone() const; virtual char const *typeString() const; virtual void parse(); - virtual int match(ACLChecklist *checklist); + virtual int match(ACLChecklist *cl); virtual wordlist *dump() const; - virtual bool empty () const; - virtual bool valid () const; + virtual bool empty() const; + virtual bool valid() const; virtual bool requiresRequest() const {return true;} int getMaximum() const {return maximum;} @@ -67,9 +66,9 @@ public: private: static Prototype RegistryProtoype; static ACLMaxUserIP RegistryEntry_; - static ACLFlag SupportedFlags[]; + static ACLFlag SupportedFlags[]; - int match(Auth::UserRequest::Pointer, Ip::Address const &); + int match(Auth::UserRequest::Pointer auth_user_request, Ip::Address const &src_addr); char const *class_; int maximum; }; diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc index 91e2bc1647..8be5df9ce9 100644 --- a/src/auth/AclProxyAuth.cc +++ b/src/auth/AclProxyAuth.cc @@ -49,13 +49,13 @@ ACLProxyAuth::~ACLProxyAuth() delete data; } -ACLProxyAuth::ACLProxyAuth(ACLData *newData, char const *theType) : data (newData), type_(theType) {} +ACLProxyAuth::ACLProxyAuth(ACLData *newData, char const *theType) : data(newData), type_(theType) {} -ACLProxyAuth::ACLProxyAuth (ACLProxyAuth const &old) : data (old.data->clone()), type_(old.type_) +ACLProxyAuth::ACLProxyAuth(ACLProxyAuth const &old) : data(old.data->clone()), type_(old.type_) {} ACLProxyAuth & -ACLProxyAuth::operator= (ACLProxyAuth const &rhs) +ACLProxyAuth::operator=(ACLProxyAuth const &rhs) { data = rhs.data->clone(); type_ = rhs.type_; @@ -106,13 +106,13 @@ ACLProxyAuth::dump() const } bool -ACLProxyAuth::empty () const +ACLProxyAuth::empty() const { return data->empty(); } bool -ACLProxyAuth::valid () const +ACLProxyAuth::valid() const { if (authenticateSchemeCount() == 0) { debugs(28, DBG_CRITICAL, "Can't use proxy auth because no authentication schemes were compiled."); diff --git a/src/auth/AclProxyAuth.h b/src/auth/AclProxyAuth.h index cdcb5aefc6..636c857666 100644 --- a/src/auth/AclProxyAuth.h +++ b/src/auth/AclProxyAuth.h @@ -43,7 +43,7 @@ class ProxyAuthLookup : public ACLChecklist::AsyncState public: static ProxyAuthLookup *Instance(); - virtual void checkForAsync(ACLChecklist *)const; + virtual void checkForAsync(ACLChecklist *) const; private: static ProxyAuthLookup instance_; @@ -52,14 +52,13 @@ private: class ACLProxyAuth : public ACL { - public: MEMPROXY_CLASS(ACLProxyAuth); ~ACLProxyAuth(); ACLProxyAuth(ACLData *, char const *); - ACLProxyAuth (ACLProxyAuth const &); - ACLProxyAuth &operator= (ACLProxyAuth const &); + ACLProxyAuth(ACLProxyAuth const &); + ACLProxyAuth &operator =(ACLProxyAuth const &); virtual char const *typeString() const; virtual void parse(); @@ -67,8 +66,8 @@ public: virtual int match(ACLChecklist *checklist); virtual wordlist *dump() const; - virtual bool valid () const; - virtual bool empty () const; + virtual bool valid() const; + virtual bool empty() const; virtual bool requiresRequest() const {return true;} virtual ACL *clone() const; diff --git a/src/comm.cc b/src/comm.cc index 017a4c3315..9f19f1dbb4 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -1927,7 +1927,7 @@ DeferredReadManager::~DeferredReadManager() /* explicit instantiation required for some systems */ -/// \cond AUTODOCS-IGNORE +/// \cond AUTODOCS_IGNORE template cbdata_type CbDataList::CBDATA_CbDataList; /// \endcond diff --git a/src/format/Quoting.cc b/src/format/Quoting.cc index c27c7b0532..6856f8ebe5 100644 --- a/src/format/Quoting.cc +++ b/src/format/Quoting.cc @@ -19,64 +19,6 @@ static const char c2x[] = "e0e1e2e3e4e5e6e7e8e9eaebecedeeef" "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"; -#if DEAD_USING_QUOTEMIMEBLOB -/** copy of Log::QuoteMimeBlob. Bugs there will be found here. - * This omits [] characters but is otherwise identical to Log::QuoteMimeBlob when OLD_LOG_MIME = 1 - */ -static char * -username_quote(const char *header) -{ - int c; - int i; - char *buf; - char *buf_cursor; - - if (header == NULL) { - buf = static_cast(xcalloc(1, 1)); - *buf = '\0'; - return buf; - } - - buf = static_cast(xcalloc(1, (strlen(header) * 3) + 1)); - buf_cursor = buf; - /* - * We escape: space \x00-\x1F and space (0x40) and \x7F-\xFF - * to prevent garbage in the logs. CR and LF are also there just in case. - */ - - while ((c = *(const unsigned char *) header++) != '\0') { - if (c == '\r') { - *buf_cursor = '\\'; - ++buf_cursor; - *buf_cursor = 'r'; - ++buf_cursor; - } else if (c == '\n') { - *buf_cursor = '\\'; - ++buf_cursor; - *buf_cursor = 'n'; - ++buf_cursor; - } else if (c <= 0x1F - || c >= 0x7F - || c == '%' - || c == ' ') { - *buf_cursor = '%'; - ++buf_cursor; - i = c * 2; - *buf_cursor = c2x[i]; - ++buf_cursor; - *buf_cursor = c2x[i + 1]; - ++buf_cursor; - } else { - *buf_cursor = (char) c; - ++buf_cursor; - } - } - - *buf_cursor = '\0'; - return buf; -} -#endif // DEAD - char * Format::QuoteUrlEncodeUsername(const char *name) { @@ -87,7 +29,6 @@ Format::QuoteUrlEncodeUsername(const char *name) return NULL; return QuoteMimeBlob(name); -// return username_quote(name); } char * @@ -106,7 +47,7 @@ Format::QuoteMimeBlob(const char *header) buf = static_cast(xcalloc(1, (strlen(header) * 3) + 1)); buf_cursor = buf; - /** + /* * Whe OLD_LOG_MIME is defined we escape: \x00-\x1F"#%;<>?{}|\\\\^~`\[\]\x7F-\xFF * which is the default escape list for the CPAN Perl5 URI module * modulo the inclusion of space (x40) to make the raw logs a bit diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h index c382b1e3cf..6922363fbf 100644 --- a/src/ip/QosConfig.h +++ b/src/ip/QosConfig.h @@ -142,7 +142,7 @@ class Config public: Config(); - ~Config() {}; + ~Config() {} void parseConfigLine(); diff --git a/src/ssl/cert_validate_message.h b/src/ssl/cert_validate_message.h index d3d2221c56..31b4e2c113 100644 --- a/src/ssl/cert_validate_message.h +++ b/src/ssl/cert_validate_message.h @@ -1,12 +1,10 @@ -/* - */ - #ifndef SQUID_SSL_CERT_VALIDATE_MESSAGE_H #define SQUID_SSL_CERT_VALIDATE_MESSAGE_H #include "HelperReply.h" #include "ssl/crtd_message.h" #include "ssl/support.h" + #include namespace Ssl @@ -41,7 +39,7 @@ public: public: RecvdError(): id(0), error_no(SSL_ERROR_NONE), cert(NULL) {} RecvdError(const RecvdError &); - RecvdError & operator = (const RecvdError &); + RecvdError & operator =(const RecvdError &); void setCert(X509 *); ///< Sets cert to the given certificate int id; ///< The id of the error ssl_error_t error_no; ///< The OpenSSL error code @@ -62,9 +60,9 @@ public: * This class is responsible for composing or parsing messages destined to * or comming from a cert validator helper. * The messages format is: - * ...\1 + * response/request-code SP body-length SP [key=value ...] \x01 */ -class CertValidationMsg: public CrtdMessage +class CertValidationMsg : public CrtdMessage { private: /** @@ -78,7 +76,7 @@ private: X509_Pointer cert; ///< A pointer to certificate CertItem(): cert(NULL) {} CertItem(const CertItem &); - CertItem & operator = (const CertItem &); + CertItem & operator =(const CertItem &); void setCert(X509 *); ///< Sets cert to the given certificate }; @@ -110,4 +108,5 @@ public: }; }//namespace Ssl + #endif // SQUID_SSL_CERT_VALIDATE_MESSAGE_H diff --git a/src/ssl/crtd_message.h b/src/ssl/crtd_message.h index 459472716b..747bd8e8e9 100644 --- a/src/ssl/crtd_message.h +++ b/src/ssl/crtd_message.h @@ -15,7 +15,7 @@ class CertificateProperties; /** * This class is responsible for composing and parsing messages destined to, or comming * from an ssl_crtd server. Format of these mesages is: - * + * response/request-code SP body length SP body */ class CrtdMessage { @@ -98,4 +98,5 @@ protected: }; } //namespace Ssl + #endif // SQUID_SSL_CRTD_MESSAGE_H