From 561076e2b756c83b1e43c9644475ce5e3c672f0f Mon Sep 17 00:00:00 2001
From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 30 Aug 2012 13:12:40 +0200
Subject: [PATCH] Moved some methods to tools.h

---
 src/htcp.cc               |  1 +
 src/ipc.cc                |  1 +
 src/ipc/Coordinator.cc    |  1 +
 src/ipc/StartListening.cc |  1 +
 src/protos.h              | 16 +---------------
 src/tools.h               | 16 ++++++++++++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/htcp.cc b/src/htcp.cc
index 22a3bf68bd..7f0412a85b 100644
--- 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 adb493a65c..f2696a499d 100644
--- 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 e54b028cbf..26320c620d 100644
--- 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 b6dde63133..8a157b89fb 100644
--- 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 31dadc62ec..c50b2620af 100644
--- 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 c8a0365e3f..c143745928 100644
--- 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_ */
-- 
2.47.3