Some functions needlessly return const int. De-const-ified.

diff --git a/src/Debug.h b/src/Debug.h
index 6e5b90d4128bef0d579ef6a80f1e9ff5efd8263d..c9f1fce3f01156bfdd355a6cba2f03d028b14a6f 100644 (file)
--- a/src/Debug.h
+++ b/src/Debug.h
@@ -100,7 +100,7 @@ private:
 
 extern FILE *debug_log;
 
-const size_t BuildPrefixInit();
+size_t BuildPrefixInit();
 const char * SkipBuildPrefix(const char* path);
 
 /* Debug stream */

diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc
index 09dd5a167e2333bf02823ad243807e9c6b2d48ed..69f0b3b640c05c5aae1e66b35cc06dd8131a0c1b 100644 (file)
--- a/src/HelperChildConfig.cc
+++ b/src/HelperChildConfig.cc
@@ -23,7 +23,7 @@ HelperChildConfig::operator =(const HelperChildConfig &rhs)
     return *this;
 }
 
-const int
+int
 HelperChildConfig::needNew() const
 {
     /* during the startup and reconfigure use our special amount... */

diff --git a/src/HelperChildConfig.h b/src/HelperChildConfig.h
index 07af956db88a4a063abdba90a8fb0623132dcf66..06c507fd93c3782428f3cdff3e9819ed6b17a247 100644 (file)
--- a/src/HelperChildConfig.h
+++ b/src/HelperChildConfig.h
@@ -21,7 +21,7 @@ public:
      * \retval N < 0   Error. No more helpers may be started.
      * \retval N       N more helpers may be started immediately.
      */
-    const int needNew() const;
+    int needNew() const;
     void parseConfig();
 
     /* values from squid.conf */

diff --git a/src/debug.cc b/src/debug.cc
index ba79fb88621f719cdb95fffa09cdace99ff03064..f6e6b50471326116bb559aa7cc5e5db4a92fd8a3 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -782,7 +782,7 @@ Debug::xassert(const char *msg, const char *file, int line)
 
 std::ostringstream (*Debug::CurrentDebug)(NULL);
 
-const size_t
+size_t
 BuildPrefixInit()
 {
     // XXX: This must be kept in sync with the actual debug.cc location

diff --git a/src/ip/Address.cc b/src/ip/Address.cc
index bf53eae57f0830b107290431ee4f26ecead080a1..bfee8064521b885b2963c7c1966e3dd64fad669b 100644 (file)
--- a/src/ip/Address.cc
+++ b/src/ip/Address.cc
@@ -116,7 +116,7 @@ Ip::Address::GetCIDR() const
     return len;
 }
 
-const int
+int
 Ip::Address::ApplyMask(Ip::Address const &mask_addr)
 {
     uint32_t *p1 = (uint32_t*)(&m_SocketAddr.sin6_addr);

diff --git a/src/ip/Address.h b/src/ip/Address.h
index 55254522c64d3e2463563f354b59dec1a9ec8136..3665de500807f769492f65adb8c1f4e0cc3e84eb 100644 (file)
--- a/src/ip/Address.h
+++ b/src/ip/Address.h
@@ -228,7 +228,7 @@ public:
     /** Apply a mask to the stored address.
      \param mask Netmask format to be bit-mask-AND'd over the stored address.
      */
-    const int ApplyMask(const Address &mask);
+    int ApplyMask(const Address &mask);
 
     /** Apply a mask to the stored address.
      *  CIDR will be converted appropriate to map the stored content.

diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc
index adb10851cccf8ca4147ee0bc50e6e0da13bba3bd..6c2eb1bc0346c12133c2f9cdffe6cebf1f75c07c 100644 (file)
--- a/src/tests/stub_HelperChildConfig.cc
+++ b/src/tests/stub_HelperChildConfig.cc
@@ -23,7 +23,7 @@ HelperChildConfig::operator =(const HelperChildConfig &rhs)
     return *this;
 }
 
-const int
+int
 HelperChildConfig::needNew() const
 {
     /* during the startup and reconfigure use our special amount... */