From c613b06fb041beed2cb5d4093d2613f85daa86f0 Mon Sep 17 00:00:00 2001
From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Wed, 28 Mar 2018 00:14:13 +0200
Subject: [PATCH] rec: perform constructor initialization in initialization
 list

---
 pdns/dnsparser.hh   |  9 ++-------
 pdns/dnsrecords.cc  |  3 +--
 pdns/gss_context.cc | 13 ++++---------
 pdns/logger.cc      | 12 +++---------
 pdns/logger.hh      |  6 ++----
 5 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
index 9ddc942ab..28ce70386 100644
--- a/pdns/dnsparser.hh
+++ b/pdns/dnsparser.hh
@@ -276,13 +276,8 @@ protected:
 
 struct DNSRecord
 {
-  DNSRecord() {
-    d_type = 0;
-    d_class = QClass::IN;
-    d_ttl = 0;
-    d_clen = 0;
-    d_place = DNSResourceRecord::ANSWER;
-  }
+  DNSRecord() : d_type(0), d_class(QClass::IN), d_ttl(0), d_clen(0), d_place(DNSResourceRecord::ANSWER)
+  {}
   explicit DNSRecord(const DNSResourceRecord& rr);
   DNSName d_name;
   std::shared_ptr<DNSRecordContent> d_content;
diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 6ee780f21..6f88eee25 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -266,9 +266,8 @@ boilerplate_conv(SRV, QType::SRV,
                  )
 
 SOARecordContent::SOARecordContent(const DNSName& mname, const DNSName& rname, const struct soatimes& st) 
-: d_mname(mname), d_rname(rname)
+: d_mname(mname), d_rname(rname), d_st(st)
 {
-  d_st=st;
 }
 
 boilerplate_conv(SOA, QType::SOA,
diff --git a/pdns/gss_context.cc b/pdns/gss_context.cc
index 8ef1061cc..3c2ed292c 100644
--- a/pdns/gss_context.cc
+++ b/pdns/gss_context.cc
@@ -40,8 +40,8 @@
 #ifndef ENABLE_GSS_TSIG
 
 bool GssContext::supported() { return false; }
-GssContext::GssContext() { d_error = GSS_CONTEXT_UNSUPPORTED; d_type = GSS_CONTEXT_NONE; }
-GssContext::GssContext(const DNSName& label) { d_error = GSS_CONTEXT_UNSUPPORTED; d_type = GSS_CONTEXT_NONE; }
+GssContext::GssContext() : d_error(GSS_CONTEXT_UNSUPPORTED), d_type(GSS_CONTEXT_NONE) {}
+GssContext::GssContext(const DNSName& label) : d_error(GSS_CONTEXT_UNSUPPORTED), d_type(GSS_CONTEXT_NONE) {}
 void GssContext::setLocalPrincipal(const std::string& name) {}
 bool GssContext::getLocalPrincipal(std::string& name) { return false; }
 void GssContext::setPeerPrincipal(const std::string& name) {}
@@ -61,14 +61,9 @@ GssContextError GssContext::getError() { return GSS_CONTEXT_UNSUPPORTED; }
 
 class GssCredential : boost::noncopyable {
 public:
-  GssCredential(const std::string& name, const gss_cred_usage_t usage) {
+  GssCredential(const std::string& name, const gss_cred_usage_t usage) :
+    d_valid(false), d_nameS(name), d_name(GSS_C_NO_NAME), d_cred(GSS_C_NO_CREDENTIAL), d_usage(usage) {
     gss_buffer_desc buffer;
-    d_name = GSS_C_NO_NAME;
-    d_nameS = name;
-    d_cred = GSS_C_NO_CREDENTIAL;
-
-    d_usage = usage;
-    d_valid = false;
     
     if (name.empty() == false) {
       buffer.length = name.size();
diff --git a/pdns/logger.cc b/pdns/logger.cc
index 484768ffe..0e3c54c8b 100644
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -102,16 +102,10 @@ void Logger::initKey()
     unixDie("Creating thread key for logger");
 }
 
-Logger::Logger(const string &n, int facility)
+Logger::Logger(const string &n, int facility) :
+  name(n), flags(LOG_PID|LOG_NDELAY), d_facility(facility), d_loglevel(Logger::None),
+  consoleUrgency(Error), opened(false), d_disableSyslog(false)
 {
-  opened=false;
-  flags=LOG_PID|LOG_NDELAY;
-  d_facility=facility;
-  d_loglevel=Logger::None;
-  d_disableSyslog=false;
-  consoleUrgency=Error;
-  name=n;
-
   if(pthread_once(&s_once, initKey))
     unixDie("Creating thread key for logger");
 
diff --git a/pdns/logger.hh b/pdns/logger.hh
index 5cd9e18e8..e08fa0d54 100644
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -92,10 +92,8 @@ public:
 private:
   struct PerThread
   {
-    PerThread() 
-    {
-      d_urgency=Info;
-    }
+    PerThread() : d_urgency(Info)
+    {}
     string d_output;
     Urgency d_urgency;
   };
-- 
2.40.0