lib: reworked some class initializations

bareos · Nov 20, 2018 · 20a3731 · 20a3731
1 parent 02c9444
commit 20a3731
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/core/src/dird/dird_conf.h b/core/src/dird/dird_conf.h
@@ -144,7 +144,9 @@ class DirectorResource: public TlsResource {
    char *log_timestamp_format;        /* Timestamp format to use in generic logging messages */
    s_password keyencrkey;             /* Key Encryption Key */
 
-   DirectorResource() : TlsResource() {}
+   DirectorResource()
+    : TlsResource()
+    , DIRaddrs(nullptr) {}
 };
 
 /*

diff --git a/core/src/lib/address_conf.cc b/core/src/lib/address_conf.cc
@@ -42,8 +42,21 @@
 //#include <resolv.h>
 #endif
 
-IPADDR::IPADDR(const IPADDR &src) : type(src.type)
+IPADDR::IPADDR()
+  : type(R_UNDEFINED)
+  , saddr(nullptr)
+  , saddr4(nullptr)
+#ifdef HAVE_IPV6
+  , saddr6(nullptr)
+#endif
+{
+   memset(&saddrbuf, 0, sizeof(saddrbuf));
+}
+
+IPADDR::IPADDR(const IPADDR &src)
+  : IPADDR()
 {
+  type = src.type;
   memcpy(&saddrbuf, &src.saddrbuf, sizeof(saddrbuf));
   saddr  = &saddrbuf.dontuse;
   saddr4 = &saddrbuf.dontuse4;
@@ -52,8 +65,10 @@ IPADDR::IPADDR(const IPADDR &src) : type(src.type)
 #endif
 }
 
-IPADDR::IPADDR(int af) : type(R_EMPTY)
+IPADDR::IPADDR(int af)
+  : IPADDR()
 {
+  type = R_EMPTY;
 #ifdef HAVE_IPV6
    if (!(af == AF_INET6 || af == AF_INET)) {
       Emsg1(M_ERROR_TERM, 0, _("Only ipv4 and ipv6 are supported (%d)\n"), af);

diff --git a/core/src/lib/address_conf.h b/core/src/lib/address_conf.h
@@ -30,12 +30,12 @@
 class IPADDR : public SmartAlloc {
  public:
    typedef enum { R_SINGLE, R_SINGLE_PORT, R_SINGLE_ADDR, R_MULTIPLE,
-                  R_DEFAULT, R_EMPTY
+                  R_DEFAULT, R_EMPTY, R_UNDEFINED
    } i_type;
    IPADDR(int af);
    IPADDR(const IPADDR & src);
  private:
-   IPADDR() {  /* block this construction */ }
+   IPADDR();
    i_type type;
    union {
       struct sockaddr dontuse;

diff --git a/core/src/lib/dlist.h b/core/src/lib/dlist.h
@@ -52,6 +52,10 @@
 struct dlink {
    void *next;
    void *prev;
+   dlink() {
+     next = nullptr;
+     prev = nullptr;
+   }
 };
 
 class dlist : public SmartAlloc {
@@ -105,7 +109,7 @@ inline void dlist::init(void *item, dlink *link)
 
 inline void dlist::init()
 {
-   head = tail = NULL;
+   head = tail = nullptr;
    loffset = 0;
    num_items = 0;
 }
@@ -125,8 +129,13 @@ inline dlist::dlist(void *item, dlink *link)
 }
 
 /* Constructor with link at head of item */
-inline dlist::dlist(void) : head(0), tail(0), loffset(0), num_items(0)
+inline dlist::dlist(void)
+   : head(nullptr)
+   , tail(nullptr)
+   , loffset(0)
+   , num_items(0)
 {
+  return;
 }
 
 inline void dlist::SetPrev(void *item, void *prev)