Perform initialization in initialization list instead of in constructor body

diff --git a/pdns/backends/gsql/ssql.hh b/pdns/backends/gsql/ssql.hh
index d3d2285d17d0010528d9b94bfe8972458cc8fa0c..df71eb91fe6d5d5a2e3d9dd88187dfbbc0836e5a 100644 (file)
--- a/pdns/backends/gsql/ssql.hh
+++ b/pdns/backends/gsql/ssql.hh
@@ -32,9 +32,8 @@
 class SSqlException 
 {
 public: 
-  SSqlException(const string &reason) 
+  SSqlException(const string &reason) : d_reason(reason)
   {
-      d_reason=reason;
   }
   
   string txtReason()

diff --git a/pdns/dnsbulktest.cc b/pdns/dnsbulktest.cc
index 4140686420730db4ac846697b4b1023b7084068b..27a288173be8e29c02576c3c2b853d09eaef1d91 100644 (file)
--- a/pdns/dnsbulktest.cc
+++ b/pdns/dnsbulktest.cc
@@ -77,10 +77,8 @@ struct SendReceive
   
   boost::array<double, 11> d_probs;
   
-  SendReceive(const std::string& remoteAddr, uint16_t port)  
+  SendReceive(const std::string& remoteAddr, uint16_t port) : d_probs({{0.001,0.01, 0.025, 0.1, 0.25,0.5,0.75,0.9,0.975, 0.99,0.9999}})
   {
-    boost::array<double, 11> tmp ={{0.001,0.01, 0.025, 0.1, 0.25,0.5,0.75,0.9,0.975, 0.99,0.9999}};
-    d_probs = tmp;
     d_acc = new acc_t(boost::accumulators::tag::extended_p_square::probabilities=d_probs);
     // 
     //d_acc = acc_t

diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh
index c4ae2bac3ac5021cc9dec6859dbec435745096c9..0be157419bca167882c7d5bddb5fffef1786089d 100644 (file)
--- a/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@ -283,9 +283,7 @@ enum class PrometheusMetricType: int {
 
 // Keeps additional information about metrics
 struct MetricDefinition {
-  MetricDefinition(PrometheusMetricType prometheusType, const std::string& description) {
-    this->prometheusType = prometheusType;
-    this->description = description;
+  MetricDefinition(PrometheusMetricType prometheusType, const std::string& description): description(description), prometheusType(prometheusType) {
   }
  
   MetricDefinition() = default;

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index b5fcdb51c12f35651d1ef5ceac919bb9d00f0cfe..82b3689fc16f7782b7acc150c40390a3495fe595 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -93,45 +93,45 @@ uint16_t DNSPacket::getRemotePort() const
   return d_remote.sin4.sin_port;
 }
 
-DNSPacket::DNSPacket(const DNSPacket &orig)
+DNSPacket::DNSPacket(const DNSPacket &orig) :
+  d_socket(orig.d_socket),
+  d_remote(orig.d_remote),
+  d_dt(orig.d_dt),
+  d_compress(orig.d_compress),
+  d_tcp(orig.d_tcp),
+  qtype(orig.qtype),
+  qclass(orig.qclass),
+  qdomain(orig.qdomain),
+  qdomainwild(orig.qdomainwild),
+  qdomainzone(orig.qdomainzone),
+  d_maxreplylen(orig.d_maxreplylen),
+  d_wantsnsid(orig.d_wantsnsid),
+  d_anyLocal(orig.d_anyLocal),
+  d_eso(orig.d_eso),
+  d_haveednssubnet(orig.d_haveednssubnet),
+  d_haveednssection(orig.d_haveednssection),
+  d_ednsversion(orig.d_ednsversion),
+  d_ednsrcode(orig.d_ednsrcode),
+  d_dnssecOk(orig.d_dnssecOk),
+  d_rrs(orig.d_rrs),
+
+  d_tsigkeyname(orig.d_tsigkeyname),
+  d_tsigprevious(orig.d_tsigprevious),
+  d_tsigtimersonly(orig.d_tsigtimersonly),
+  d_trc(orig.d_trc),
+  d_tsigsecret(orig.d_tsigsecret),
+  d_ednsRawPacketSizeLimit(orig.d_ednsRawPacketSizeLimit),
+  d_havetsig(orig.d_havetsig),
+  d_wrapped(orig.d_wrapped),
+
+  d_rawpacket(orig.d_rawpacket),
+  d_tsig_algo(orig.d_tsig_algo),
+  d(orig.d),
+
+  d_isQuery(orig.d_isQuery),
+  d_hash(orig.d_hash)
 {
   DLOG(g_log<<"DNSPacket copy constructor called!"<<endl);
-  d_socket=orig.d_socket;
-  d_remote=orig.d_remote;
-  d_dt=orig.d_dt;
-  d_compress=orig.d_compress;
-  d_tcp=orig.d_tcp;
-  qtype=orig.qtype;
-  qclass=orig.qclass;
-  qdomain=orig.qdomain;
-  qdomainwild=orig.qdomainwild;
-  qdomainzone=orig.qdomainzone;
-  d_maxreplylen = orig.d_maxreplylen;
-  d_wantsnsid = orig.d_wantsnsid;
-  d_anyLocal = orig.d_anyLocal;  
-  d_eso = orig.d_eso;
-  d_haveednssubnet = orig.d_haveednssubnet;
-  d_haveednssection = orig.d_haveednssection;
-  d_ednsversion = orig.d_ednsversion;
-  d_ednsrcode = orig.d_ednsrcode;
-  d_dnssecOk = orig.d_dnssecOk;
-  d_rrs=orig.d_rrs;
-  
-  d_tsigkeyname = orig.d_tsigkeyname;
-  d_tsigprevious = orig.d_tsigprevious;
-  d_tsigtimersonly = orig.d_tsigtimersonly;
-  d_trc = orig.d_trc;
-  d_tsigsecret = orig.d_tsigsecret;
-  d_ednsRawPacketSizeLimit = orig.d_ednsRawPacketSizeLimit;
-  d_havetsig = orig.d_havetsig;
-  d_wrapped=orig.d_wrapped;
-
-  d_rawpacket=orig.d_rawpacket;
-  d_tsig_algo=orig.d_tsig_algo;
-  d=orig.d;
-
-  d_isQuery = orig.d_isQuery;
-  d_hash = orig.d_hash;
 }
 
 void DNSPacket::setRcode(int v)

diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 381054c87ebf22756ddbf04049fb943c32b570f2..ceb3dd4119c2e8d70f4c7fa0ccc0fe899fb404c4 100644 (file)
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -165,21 +165,21 @@ void DynListener::listenOnTCP(const ComboAddress& local)
 }
 
 
-DynListener::DynListener(const ComboAddress& local)
+DynListener::DynListener(const ComboAddress& local) :
+  d_tcp(true),
+  d_client(-1),
+  d_tid(0),
+  d_ppid(0)
 {
   listenOnTCP(local);
-  d_tcp=true;
-  d_client=-1;
-  d_tid=0;
-  d_ppid=0;
 }
 
-DynListener::DynListener(const string &progname)
+DynListener::DynListener(const string &progname) :
+  d_client(-1),
+  d_tid(0),
+  d_ppid(0),
+  d_s(-1)
 {
-  d_client=-1;
-  d_tid=0;
-  d_ppid=0;
-  d_s=-1;
 
   if(!progname.empty()) {
     string socketname = ::arg()["socket-dir"];

diff --git a/pdns/ixfrdist-web.cc b/pdns/ixfrdist-web.cc
index 751bb716fa5b9f591fc28c4a5845c4d87f0c4035..01d2505d8ffd885481c24b1af15e1cdc37d26e54 100644 (file)
--- a/pdns/ixfrdist-web.cc
+++ b/pdns/ixfrdist-web.cc
@@ -27,8 +27,9 @@
 
 string doGetStats();
 
-IXFRDistWebServer::IXFRDistWebServer(const ComboAddress &listenAddress, const NetmaskGroup &acl) {
-  d_ws = std::unique_ptr<WebServer>(new WebServer(listenAddress.toString(), listenAddress.getPort()));
+IXFRDistWebServer::IXFRDistWebServer(const ComboAddress &listenAddress, const NetmaskGroup &acl) :
+  d_ws(std::unique_ptr<WebServer>(new WebServer(listenAddress.toString(), listenAddress.getPort())))
+{
   d_ws->setACL(acl);
   d_ws->registerWebHandler("/metrics", boost::bind(&IXFRDistWebServer::getMetrics, this, _1, _2));
   d_ws->bind();

diff --git a/pdns/misc.cc b/pdns/misc.cc
index 196a4bcf4822bd309f069cc0ccb5c49108647503..8282997a54c065f2fae860885441f726267e2d95 100644 (file)
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -446,9 +446,8 @@ DTime::DTime()
   d_set.tv_sec=d_set.tv_usec=0;
 }
 
-DTime::DTime(const DTime &dt)
+DTime::DTime(const DTime &dt) : d_set(dt.d_set)
 {
-  d_set=dt.d_set;
 }
 
 time_t DTime::time()

diff --git a/pdns/misc.hh b/pdns/misc.hh
index fcf3c6a51dabe77557ee3b6a8fce01febac1f6e2..f04d7bb72c5252db766a311311b224c4e3e225bf 100644 (file)
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -470,10 +470,8 @@ private:
 class SimpleMatch
 {
 public:
-  SimpleMatch(const string &mask, bool caseFold = false)
+  SimpleMatch(const string &mask, bool caseFold = false): d_mask(mask), d_fold(caseFold)
   {
-    this->d_mask = mask;
-    this->d_fold = caseFold;
   }
  
   bool match(string::const_iterator mi, string::const_iterator mend, string::const_iterator vi, string::const_iterator vend)

diff --git a/pdns/pdnsexception.hh b/pdns/pdnsexception.hh
index 3f1e385d413e4ea7d3be5dcbee933009948568dc..f820f551599fb65f0b4339d9307ae4e7ad9fd32c 100644 (file)
--- a/pdns/pdnsexception.hh
+++ b/pdns/pdnsexception.hh
@@ -31,8 +31,8 @@
 class PDNSException
 {
 public:
-  PDNSException(){reason="Unspecified";};
-  PDNSException(string r){reason=r;};
+  PDNSException() : reason("Unspecified") {};
+  PDNSException(string r) : reason(r) {};
   
   string reason; //! Print this to tell the user what went wrong
 };

diff --git a/pdns/pkcs11signers.cc b/pdns/pkcs11signers.cc
index 55c933774f8421ad26594db13bae0a37ba699e2b..ebc51c6a40e421326f5bf84db9061fb3bfb41d92 100644 (file)
--- a/pdns/pkcs11signers.cc
+++ b/pdns/pkcs11signers.cc
@@ -217,12 +217,13 @@ class Pkcs11Slot {
     }
 
   public:
-    Pkcs11Slot(CK_FUNCTION_LIST* functions, const CK_SLOT_ID& slot) {
+  Pkcs11Slot(CK_FUNCTION_LIST* functions, const CK_SLOT_ID& slot) :
+      d_slot(slot),
+      d_functions(functions),
+      d_err(0),
+      d_logged_in(false)
+  {
       CK_TOKEN_INFO tokenInfo;
-      d_slot = slot;
-      d_functions = functions;
-      d_err = 0;
-      d_logged_in = false;
       pthread_mutex_init(&(this->d_m), NULL);
       Lock l(&d_m);
 
@@ -768,14 +769,15 @@ std::shared_ptr<Pkcs11Token> Pkcs11Token::GetToken(const std::string& module, co
   return pkcs11_tokens[tidx];
 }
 
-Pkcs11Token::Pkcs11Token(const std::shared_ptr<Pkcs11Slot>& slot, const std::string& label, const std::string& pub_label) {
+Pkcs11Token::Pkcs11Token(const std::shared_ptr<Pkcs11Slot>& slot, const std::string& label, const std::string& pub_label) :
+  d_bits(0),
+  d_slot(slot),
+  d_label(label),
+  d_pub_label(pub_label),
+  d_err(0),
+  d_loaded(false)
+{
   // open a session
-  this->d_bits = 0;
-  this->d_slot = slot;
-  this->d_label = label;
-  this->d_pub_label = pub_label;
-  this->d_err = 0;
-  this->d_loaded = false;
   if (this->d_slot->LoggedIn()) LoadAttributes();
 }
 

diff --git a/pdns/ssqlite3.cc b/pdns/ssqlite3.cc
index 62b223ceb2d2b76c1cd5cfe628460461b8205e04..860d25452c937370daef0f53686f57bff31ab260 100644 (file)
--- a/pdns/ssqlite3.cc
+++ b/pdns/ssqlite3.cc
@@ -49,13 +49,14 @@ int pdns_sqlite3_clear_bindings(sqlite3_stmt *pStmt){
 class SSQLite3Statement: public SSqlStatement
 {
 public:
-  SSQLite3Statement(SSQLite3 *db, bool dolog, const string& query) : d_prepared(false)
+  SSQLite3Statement(SSQLite3 *db, bool dolog, const string& query) :
+    d_prepared(false),
+    d_query(query),
+    d_dolog(dolog),
+    d_stmt(NULL),
+    d_rc(0),
+    d_db(db)
   {
-    this->d_query = query;
-    this->d_dolog = dolog;
-    d_stmt = NULL;
-    d_rc = 0;
-    d_db = db;
   }
 
   int name2idx(const string& name) {

diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index cb2a448591e68a07eb02fe0f38e4c766533c0910..d9bbebf0695ba22a88a40487ccb9d7279a0b63ac 100644 (file)
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -72,11 +72,8 @@ typedef map<
 template<class Thing> class Throttle : public boost::noncopyable
 {
 public:
-  Throttle()
+  Throttle() : d_limit(3), d_ttl(60), d_last_clean(time(0))
   {
-    d_limit=3;
-    d_ttl=60;
-    d_last_clean=time(0);
   }
 
   struct entry
@@ -967,7 +964,7 @@ private:
 class ImmediateServFailException
 {
 public:
-  ImmediateServFailException(string r){reason=r;};
+  ImmediateServFailException(string r) : reason(r) {};
 
   string reason; //! Print this to tell the user what went wrong
 };

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 71ac17730f7f764c2e37f95dfedbd3cd121e4442..979cc70851bf3be2f2c265649b048499536fd728 100644 (file)
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -321,10 +321,11 @@ catch(...) {
   g_log<<Logger::Error<<"HTTP: Unknown exception"<<endl;
 }
 
-WebServer::WebServer(const string &listenaddress, int port) : d_server(nullptr)
+WebServer::WebServer(const string &listenaddress, int port) :
+  d_listenaddress(listenaddress),
+  d_port(port),
+  d_server(nullptr)
 {
-  d_listenaddress=listenaddress;
-  d_port=port;
 }
 
 void WebServer::bind()

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index f822bdf27bd5b1732c57baa135383906dced5afe..5a6211f9b8d37558ab14faffa05603217f2a2030 100644 (file)
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -56,12 +56,14 @@ static void patchZone(HttpRequest* req, HttpResponse* resp);
 static void storeChangedPTRs(UeberBackend& B, vector<DNSResourceRecord>& new_ptrs);
 static void makePtr(const DNSResourceRecord& rr, DNSResourceRecord* ptr);
 
-AuthWebServer::AuthWebServer()
+AuthWebServer::AuthWebServer() :
+  d_start(time(0)),
+  d_min10(0),
+  d_min5(0),
+  d_min1(0),
+  d_ws(nullptr),
+  d_tid(0)
 {
-  d_start=time(0);
-  d_min10=d_min5=d_min1=0;
-  d_ws = 0;
-  d_tid = 0;
   if(arg().mustDo("webserver") || arg().mustDo("api")) {
     d_ws = new WebServer(arg()["webserver-address"], arg().asNum("webserver-port"));
     d_ws->setApiKey(arg()["api-key"]);

diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 7a850ffc8e7844561b0ae0cb3613bed39387fb25..fc859c57a5687e91977f580e597458c6862eadb5 100644 (file)
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -46,13 +46,11 @@ ZoneParserTNG::ZoneParserTNG(const string& fname, const DNSName& zname, const st
 }
 
 ZoneParserTNG::ZoneParserTNG(const vector<string> zonedata, const DNSName& zname):
-                                                                        d_zonename(zname), d_defaultttl(3600), 
-                                                                        d_templatecounter(0), d_templatestop(0),
-                                                                        d_templatestep(0), d_havedollarttl(false)
+  d_zonename(zname), d_zonedata(zonedata), d_defaultttl(3600),
+  d_templatecounter(0), d_templatestop(0), d_templatestep(0),
+  d_havedollarttl(false), d_fromfile(false)
 {
-  d_zonedata = zonedata;
   d_zonedataline = d_zonedata.begin();
-  d_fromfile = false;
 }
 
 void ZoneParserTNG::stackFile(const std::string& fname)