From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 31 Aug 2015 06:17:22 +0000 (+0200)
Subject: Audit round
X-Git-Tag: SQUID_4_0_1~81^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d35851f10a0c8210134006606d230c1d8c30ddca;p=thirdparty%2Fsquid.git

Audit round
---

d35851f10a0c8210134006606d230c1d8c30ddca
diff --cc src/CacheDigest.h
index 3885ef91ea,3885ef91ea..14f928f2a8
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@@ -11,7 -11,7 +11,6 @@@
  #ifndef SQUID_CACHEDIGEST_H_
  #define SQUID_CACHEDIGEST_H_
  
--/* for cache_key */
  #include "store_key_md5.h"
  
  class CacheDigestGuessStats;
diff --cc src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
index fc11fee116,fc11fee116..ffa35b90f8
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
@@@ -10,6 -10,6 +10,7 @@@
  
  #ifndef SQUID_DISKTHREADSDISKFILE_H
  #define SQUID_DISKTHREADSDISKFILE_H
++
  #include "cbdata.h"
  #include "DiskIO/DiskFile.h"
  #include "DiskThreads.h"
diff --cc src/SquidTime.h
index dc5653351e,dc5653351e..2f720dc2e0
--- a/src/SquidTime.h
+++ b/src/SquidTime.h
@@@ -16,7 -16,7 +16,7 @@@
  #include <ctime>
  /* NP: sys/time.h is provided by libcompat */
  
--/*Use uint64_t to store miliseconds*/
++/* Use uint64_t to store milliseconds*/
  typedef uint64_t time_msec_t;
  
  /* globals for accessing time */
diff --cc src/comm/Connection.h
index 2743bc595a,2743bc595a..6a29e100be
--- a/src/comm/Connection.h
+++ b/src/comm/Connection.h
@@@ -13,14 -13,14 +13,14 @@@
  
  #include "comm/forward.h"
  #include "defines.h"
--#include "hier_code.h"
--#include "ip/Address.h"
--#include "mem/forward.h"
--#include "ip/forward.h"
  #if USE_SQUID_EUI
  #include "eui/Eui48.h"
  #include "eui/Eui64.h"
  #endif
++#include "hier_code.h"
++#include "ip/Address.h"
++#include "ip/forward.h"
++#include "mem/forward.h"
  #include "SquidTime.h"
  
  #include <iosfwd>
diff --cc src/comm/forward.h
index 571bc8bfe6,571bc8bfe6..7eef538dd8
--- a/src/comm/forward.h
+++ b/src/comm/forward.h
@@@ -28,6 -28,6 +28,8 @@@ bool IsConnOpen(const Comm::ConnectionP
  
  }; // namespace Comm
  
++/// legacy CBDATA callback functions ABI definition for read or write I/O events
++/// \deprecated use CommCalls API instead where possible
  typedef void PF(int, void *);
  
  #endif /* _SQUID_COMM_FORWARD_H */
diff --cc src/fs/forward.h
index e8a14d5865,e8a14d5865..a99349fa6b
--- a/src/fs/forward.h
+++ b/src/fs/forward.h
@@@ -5,11 -5,11 +5,11 @@@
   * contributions from numerous individuals and organizations.
   * Please see the COPYING and CONTRIBUTORS files for details.
   */
++
  #ifndef SQUID_FORWARD_H_
  #define SQUID_FORWARD_H_
  
  typedef int32_t sfileno;
  typedef signed int sdirno;
  
--
  #endif /* SQUID_FORWARD_H_ */
diff --cc src/ipc/MemMap.h
index 2f8e1ee722,2f8e1ee722..f1f7c40fae
--- a/src/ipc/MemMap.h
+++ b/src/ipc/MemMap.h
@@@ -10,13 -10,13 +10,13 @@@
  #define SQUID_IPC_STORE_MAP_H
  
  #include "Debug.h"
++#include "fs/forward.h"
  #include "ipc/mem/FlexibleArray.h"
  #include "ipc/mem/Pointer.h"
  #include "ipc/ReadWriteLock.h"
  #include "SBuf.h"
  #include "store_key_md5.h"
  #include "tools.h"
--#include "fs/forward.h"
  
  #include <atomic>
  
diff --cc src/ipc/StoreMap.h
index 051f2af999,051f2af999..9e9bf791b7
--- a/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@@ -9,11 -9,11 +9,11 @@@
  #ifndef SQUID_IPC_STORE_MAP_H
  #define SQUID_IPC_STORE_MAP_H
  
++#include "fs/forward.h"
  #include "ipc/mem/FlexibleArray.h"
  #include "ipc/mem/Pointer.h"
  #include "ipc/ReadWriteLock.h"
  #include "SBuf.h"
--#include "fs/forward.h"
  #include "store_key_md5.h"
  
  namespace Ipc
diff --cc src/tests/stub_CacheDigest.cc
index b8125e117d,b8125e117d..d808a2c81b
--- a/src/tests/stub_CacheDigest.cc
+++ b/src/tests/stub_CacheDigest.cc
@@@ -7,7 -7,7 +7,7 @@@
   */
  
  #include "squid.h"
--#include "store_key_md5.h" /* for cache_key */
++#include "store_key_md5.h"
  
  #define STUB_API "CacheDigest.cc"
  #include "tests/STUB.h"
diff --cc src/typedefs.h
index 7c0a193c98,7c0a193c98..16d5efd312
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@@ -9,6 -9,6 +9,7 @@@
  #ifndef SQUID_TYPEDEFS_H
  #define SQUID_TYPEDEFS_H
  
++#include "anyp/ProtocolType.h"
  #include "enums.h"
  
  /* disk.c / diskd.c callback typedefs */