Moved some methods to tools.h

diff --git a/src/htcp.cc b/src/htcp.cc
index 22a3bf68bde85189735ae0378c828c2776b36b22..7f0412a85bbb8d08ae91b17ced22cc9fd7efde3e 100644 (file)
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -57,6 +57,7 @@
 #include "store_key_md5.h"
 #include "Store.h"
 #include "StoreClient.h"
+#include "tools.h"
 #include "URL.h"
 
 typedef struct _Countstr Countstr;

diff --git a/src/ipc.cc b/src/ipc.cc
index adb493a65ce685c45bc577d81294ff0f9da2e22e..f2696a499de22b1d762e087a26e248eff47fe5d5 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -37,6 +37,7 @@
 #include "globals.h"
 #include "ip/Address.h"
 #include "protos.h"
+#include "tools.h"
 #include "rfc1738.h"
 
 static const char *hello_string = "hi there\n";

diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc
index e54b028cbf479aa2ef8bffb970d48922e85d3fb2..26320c620da48b8bd1b2d2216657d7738443ffff 100644 (file)
--- a/src/ipc/Coordinator.cc
+++ b/src/ipc/Coordinator.cc
@@ -17,6 +17,7 @@
 #include "mgr/Request.h"
 #include "mgr/Response.h"
 #include "protos.h"
+#include "tools.h"
 #if SQUID_SNMP
 #include "snmp/Inquirer.h"
 #include "snmp/Request.h"

diff --git a/src/ipc/StartListening.cc b/src/ipc/StartListening.cc
index b6dde631334fbd362fc8d81a17b4518b2d84657b..8a157b89fb014575a8364e555a2fa780761b99c6 100644 (file)
--- a/src/ipc/StartListening.cc
+++ b/src/ipc/StartListening.cc
@@ -12,6 +12,7 @@
 #include "ipc/SharedListen.h"
 #include "ipc/StartListening.h"
 #include "protos.h"
+#include "tools.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/protos.h b/src/protos.h
index 31dadc62ec1c78a04e968f3a6f7964a25fe169d2..c50b2620af68ed034520f53547ec2345851e8692 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -89,21 +89,7 @@ extern void reconfigure(int);
 class store_client;
 
 #include "fatal.h"
-extern void death(int sig);
-extern void sigusr2_handle(int sig);
-extern void sig_child(int sig);
-extern void sig_shutdown(int sig); ///< handles shutdown notifications from kids
-SQUIDCEXTERN void leave_suid(void);
-SQUIDCEXTERN void enter_suid(void);
-SQUIDCEXTERN void no_suid(void);
-SQUIDCEXTERN void writePidFile(void);
-SQUIDCEXTERN void setSocketShutdownLifetimes(int);
-SQUIDCEXTERN void setMaxFD(void);
-SQUIDCEXTERN void setSystemLimits(void);
-extern void squid_signal(int sig, SIGHDLR *, int flags);
-SQUIDCEXTERN pid_t readPidFile(void);
-SQUIDCEXTERN void keepCapabilities(void);
-SQUIDCEXTERN void BroadcastSignalIfAny(int& sig);
+
 /// whether the current process is the parent of all other Squid processes
 SQUIDCEXTERN bool IamMasterProcess();
 /**

diff --git a/src/tools.h b/src/tools.h
index c8a0365e3f0b8475aaef6edd48d1118f811a4db0..c14374592843136fd39e76a213178ed5040072b1 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -50,4 +50,20 @@ extern void debugObj(int section, int level, const char *label, void *obj, ObjPa
 extern const char *getMyHostname(void);
 extern const char *uniqueHostname(void);
 
+extern void death(int sig);
+extern void sigusr2_handle(int sig);
+extern void sig_child(int sig);
+extern void sig_shutdown(int sig); ///< handles shutdown notifications from kids
+extern void leave_suid(void);
+extern void enter_suid(void);
+extern void no_suid(void);
+extern void writePidFile(void);
+extern void setMaxFD(void);
+extern void setSystemLimits(void);
+extern void squid_signal(int sig, SIGHDLR *, int flags);
+extern pid_t readPidFile(void);
+extern void keepCapabilities(void);
+extern void BroadcastSignalIfAny(int& sig);
+
+
 #endif /* SQUID_TOOLS_H_ */