Import remaining scraps of auto-docs branch code cleanups

diff --git a/squid3.dox b/squid3.dox
index 9f8d0fde5dd36c7a755e06ed12a5a119a5357405..be82f9d9ad043f868a206d9965ba3a5fa80f4392 100644 (file)
--- a/squid3.dox
+++ b/squid3.dox
@@ -1038,6 +1038,8 @@ PREDEFINED             = \
                        USE_SELECT_WIN32 \
                        USE_SQUID_ESI \
                        USE_SSL \
+                       USE_LINUX_TPROXY2 \
+                       USE_LINUX_TPROXY4 \
                        USE_UNLINKD \
                        USE_USERAGENT_LOG \
                        USE_WCCP \

diff --git a/src/AuthUserRequest.h b/src/AuthUserRequest.h
index 0bee36dfea8fa2a7ded5cbff6626e07d6540e039..f010b754cf45b2e47562c494d25f0e4dbd7a92ad 100644 (file)
--- a/src/AuthUserRequest.h
+++ b/src/AuthUserRequest.h
@@ -128,8 +128,8 @@ public:
     char const * getDenyMessage();
 
     size_t refCount() const;
-    void _lock();              // please use AUTHUSERREQUESTLOCK()
-    void _unlock();            // please use AUTHUSERREQUESTUNLOCK()
+    void _lock();            /**< \note please use AUTHUSERREQUESTLOCK()   */
+    void _unlock();          /**< \note please use AUTHUSERREQUESTUNLOCK() */
 
     /**
      * Squid does not make assumptions about where the username is stored.

diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h
index e7dd02ec9a016713a6be1294676fdcc6b21346f2..a9bc53d6165431839e40a5598d24d01857e9420c 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.h
+++ b/src/auth/negotiate/auth_negotiate.h
@@ -54,7 +54,7 @@ public:
     dlink_list proxy_auth_list;
 };
 
-MEMPROXY_CLASS_INLINE(NegotiateUser)                   /**DOCS_NOSEMI*/
+MEMPROXY_CLASS_INLINE(NegotiateUser);
 
 /// \ingroup AuthNegotiateAPI
 typedef class NegotiateUser negotiate_user_t;
@@ -107,7 +107,7 @@ private:
     NegotiateUser * _theUser;
 };
 
-MEMPROXY_CLASS_INLINE(AuthNegotiateUserRequest)                /**DOCS_NOSEMI*/
+MEMPROXY_CLASS_INLINE(AuthNegotiateUserRequest);
 
 /* configuration runtime data */
 

diff --git a/src/authenticate.h b/src/authenticate.h
index 9c4cd90a573f9d68446975c00d0edb4df06b1312..8b0dd00b387b91bc72216b1db22adc8983d73382 100644 (file)
--- a/src/authenticate.h
+++ b/src/authenticate.h
@@ -65,7 +65,6 @@ private:
 MEMPROXY_CLASS_INLINE(AuthUserHashPointer);
 
 class ConnStateData;
-
 class AuthScheme;
 
 /**

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 6766fe6e9c0872aadf84fa6bf855fe20741e199a..3ff8bd94af0a446af123b8c9e4477ef4faa3e7d0 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -158,7 +158,8 @@ cbdata::operator new(size_t size, void *where)
  */
 void
 cbdata::operator delete(void *where, void *where2)
-{;
+{
+    ; // empty.
 }
 
 long
@@ -169,7 +170,7 @@ cbdata::MakeOffset()
     return (long)dataOffset;
 }
 #else
-MEMPROXY_CLASS_INLINE(cbdata)                  /**DOCS_NOSEMI*/
+MEMPROXY_CLASS_INLINE(cbdata);
 #endif
 
 static OBJH cbdataDump;

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 86fed6f0fbee57f1fb3f4cc0f10b10d2d4538c71..e5fd72a5ca64fd9d8c58e1eb4878ac8d2067470f 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -72,7 +72,7 @@ typedef struct
 /* local constant and vars */
 
 /**
-/// \ingroup ErrorPageInternal
+ \ingroup ErrorPageInternal
  *
  \note  hard coded error messages are not appended with %S
  *      automagically to give you more control on the format

diff --git a/src/fs/ufs/ufscommon.h b/src/fs/ufs/ufscommon.h
index 66eb979bc6c2ca82cfb8e6e260988bfaa0872609..4059fec7d3a57050a35c89b164031c5da992ffe6 100644 (file)
--- a/src/fs/ufs/ufscommon.h
+++ b/src/fs/ufs/ufscommon.h
@@ -288,7 +288,6 @@ MEMPROXY_CLASS_INLINE(UFSStoreState::_queued_read);
 MEMPROXY_CLASS_INLINE(UFSStoreState::_queued_write);
 
 
-
 #include "StoreSearch.h"
 
 /// \ingroup UFS