From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 10 Oct 2011 16:18:55 +0000 (-0600)
Subject: Polished HelperChildConfig methods. No runtime changes expected.
X-Git-Tag: BumpSslServerFirst.take01~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db33c21707a6d9b2f8e5ace8ffd53a8011936d1;p=thirdparty%2Fsquid.git

Polished HelperChildConfig methods. No runtime changes expected.

Removed 3 out of 5 constructors as unused.

Prevented silent conversion from int to HelperChildConfig via a
single-parameter constructor.

Removed destructor and assignment operator for being identical to the
compiler-generated ones and for implying that a copy constructor is missing.
---

diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc
index 85fdf0ebd7..71c00442fe 100644
--- a/src/HelperChildConfig.cc
+++ b/src/HelperChildConfig.cc
@@ -4,31 +4,15 @@
 
 #include <string.h>
 
-HelperChildConfig::HelperChildConfig(const unsigned int m, const unsigned int s, const unsigned int i, const unsigned int cc) :
+HelperChildConfig::HelperChildConfig(const unsigned int m):
         n_max(m),
-        n_startup(s),
-        n_idle(i),
-        concurrency(cc),
+        n_startup(0),
+        n_idle(1),
+        concurrency(0),
         n_running(0),
         n_active(0)
 {}
 
-HelperChildConfig::~HelperChildConfig()
-{}
-
-HelperChildConfig &
-HelperChildConfig::operator =(const HelperChildConfig &rhs)
-{
-    // Copies everything.
-    n_max = rhs.n_max;
-    n_startup = rhs.n_startup;
-    n_idle = rhs.n_idle;
-    concurrency = rhs.concurrency;
-    n_running = rhs.n_running;
-    n_active = rhs.n_active;
-    return *this;
-}
-
 HelperChildConfig &
 HelperChildConfig::updateLimits(const HelperChildConfig &rhs)
 {
diff --git a/src/HelperChildConfig.h b/src/HelperChildConfig.h
index a6ee398029..d8f4045202 100644
--- a/src/HelperChildConfig.h
+++ b/src/HelperChildConfig.h
@@ -10,9 +10,7 @@
 class HelperChildConfig
 {
 public:
-    HelperChildConfig(const unsigned int m=0, const unsigned int s=0, const unsigned int i=1, const unsigned int cc=0);
-    ~HelperChildConfig();
-    HelperChildConfig &operator =(const HelperChildConfig &rhs);
+    explicit HelperChildConfig(const unsigned int m = 0);
 
     /**
      * When new helpers are needed call this to find out how many more
@@ -62,7 +60,6 @@ public:
     unsigned int concurrency;
 
     /* derived from active operations */
-public:
 
     /**
      * Total helper children objects currently existing.
diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc
index 6c2eb1bc03..23538ce384 100644
--- a/src/tests/stub_HelperChildConfig.cc
+++ b/src/tests/stub_HelperChildConfig.cc
@@ -4,25 +4,15 @@
 
 #include <string.h>
 
-HelperChildConfig::HelperChildConfig(const unsigned int m, const unsigned int s, const unsigned int i, const unsigned int cc) :
+HelperChildConfig::HelperChildConfig(const unsigned int m):
         n_max(m),
-        n_startup(s),
-        n_idle(i),
-        concurrency(cc),
+        n_startup(0),
+        n_idle(1),
+        concurrency(0),
         n_running(0),
         n_active(0)
 {}
 
-HelperChildConfig::~HelperChildConfig()
-{}
-
-HelperChildConfig &
-HelperChildConfig::operator =(const HelperChildConfig &rhs)
-{
-    memcpy(this, &rhs, sizeof(HelperChildConfig));
-    return *this;
-}
-
 int
 HelperChildConfig::needNew() const
 {