From cfdb8f8849a846ef4ba977d9cae5433aa2ff8f97 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 22 Apr 2008 00:05:23 +1200
Subject: [PATCH] Import remaining scraps of auto-docs branch code cleanups

---
 squid3.dox                          | 2 ++
 src/AuthUserRequest.h               | 4 ++--
 src/auth/negotiate/auth_negotiate.h | 4 ++--
 src/authenticate.h                  | 1 -
 src/cbdata.cc                       | 5 +++--
 src/errorpage.cc                    | 2 +-
 src/fs/ufs/ufscommon.h              | 1 -
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/squid3.dox b/squid3.dox
index 9f8d0fde5d..be82f9d9ad 100644
--- 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 0bee36dfea..f010b754cf 100644
--- 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 e7dd02ec9a..a9bc53d616 100644
--- 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 9c4cd90a57..8b0dd00b38 100644
--- 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 6766fe6e9c..3ff8bd94af 100644
--- 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 86fed6f0fb..e5fd72a5ca 100644
--- 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 66eb979bc6..4059fec7d3 100644
--- 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
-- 
2.47.3