Use C++11 inline initialisation for class members.

10 files changed, 29 insertions, 33 deletions

diff --git a/src/modules/m_spanningtree/commandbuilder.h b/src/modules/m_spanningtree/commandbuilder.h
index 527b53584..927213d74 100644
--- a/src/modules/m_spanningtree/commandbuilder.h
+++ b/src/modules/m_spanningtree/commandbuilder.h
@@ -35,7 +35,7 @@ class CmdBuilder
 	ClientProtocol::TagMap tags;
 
 	/** The size of tags within the contents. */
-	size_t tagsize;
+	size_t tagsize = 0;
 
 	/** Fires the ServerProtocol::MessageEventListener::OnBuildMessage event for a server target. */
 	void FireEvent(Server* target, const char* cmd, ClientProtocol::TagMap& taglist);
@@ -49,7 +49,6 @@ class CmdBuilder
  public:
 	CmdBuilder(const char* cmd)
 		: content(1, ':')
-		, tagsize(0)
 	{
 		content.append(ServerInstance->Config->GetSID());
 		push(cmd);
@@ -58,7 +57,6 @@ class CmdBuilder
 
 	CmdBuilder(TreeServer* src, const char* cmd)
 		: content(1, ':')
-		, tagsize(0)
 	{
 		content.append(src->GetId());
 		push(cmd);
@@ -67,7 +65,6 @@ class CmdBuilder
 
 	CmdBuilder(User* src, const char* cmd)
 		: content(1, ':')
-		, tagsize(0)
 	{
 		content.append(src->uuid);
 		push(cmd);
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index cdfcdd3b7..e595c680f 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -47,7 +47,6 @@ ModuleSpanningTree::ModuleSpanningTree()
 	, rsquit(this)
 	, map(this)
 	, commands(this)
-	, currmembid(0)
 	, broadcasteventprov(this, "event/server-broadcast")
 	, linkeventprov(this, "event/server-link")
 	, messageeventprov(this, "event/server-message")
@@ -56,7 +55,6 @@ ModuleSpanningTree::ModuleSpanningTree()
 	, servicetag(this)
 	, DNS(this, "DNS")
 	, tagevprov(this)
-	, loopCall(false)
 {
 }
 
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 839c859af..40f2724f5 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -94,7 +94,7 @@ class ModuleSpanningTree
 
 	/** Next membership id assigned when a local user joins a channel
 	 */
-	Membership::Id currmembid;
+	Membership::Id currmembid = 0;
 
 	/** The specialized ProtocolInterface that is assigned to ServerInstance->PI on load
 	 */
@@ -129,7 +129,7 @@ class ModuleSpanningTree
 	/** Set to true if inside a spanningtree call, to prevent sending
 	 * xlines and other things back to their source
 	 */
-	bool loopCall;
+	bool loopCall = false;
 
 	/** Constructor
 	 */
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 7d7755a6b..8bde08a39 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -39,12 +39,12 @@ class FModeBuilder : public CmdBuilder
 {
 	static const size_t maxline = 480;
 	std::string params;
-	unsigned int modes;
+	unsigned int modes = 0;
 	std::string::size_type startpos;
 
  public:
 	FModeBuilder(Channel* chan)
-		: CmdBuilder("FMODE"), modes(0)
+		: CmdBuilder("FMODE")
 	{
 		push(chan->name).push_int(chan->age).push_raw(" +");
 		startpos = str().size();
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index e40f22e91..48bedb839 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -43,14 +43,10 @@ TreeServer::TreeServer()
 	, rawversion(INSPIRCD_VERSION)
 	, Socket(NULL)
 	, behind_bursting(0)
-	, isdead(false)
 	, pingtimer(this)
 	, ServerUser(ServerInstance->FakeClient)
 	, age(ServerInstance->Time())
 	, UserCount(ServerInstance->Users.LocalUserCount())
-	, OperCount(0)
-	, rtt(0)
-	, StartBurst(0)
 	, Hidden(false)
 {
 	AddHashEntry();
@@ -65,14 +61,10 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
 	, Parent(Above)
 	, Socket(Sock)
 	, behind_bursting(Parent->behind_bursting)
-	, isdead(false)
 	, pingtimer(this)
 	, ServerUser(new FakeUser(id, this))
 	, age(ServerInstance->Time())
 	, UserCount(0)
-	, OperCount(0)
-	, rtt(0)
-	, StartBurst(0)
 	, Hidden(Hide)
 {
 	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting);
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index e6471d77e..1e7c30a1a 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -66,7 +66,7 @@ class TreeServer : public Server
 
 	/** True if this server has been lost in a split and is awaiting destruction
 	 */
-	bool isdead;
+	bool isdead = false;
 
 	/** Timer handling PINGing the server and killing it on timeout
 	 */
@@ -91,7 +91,7 @@ class TreeServer : public Server
 	const time_t age;
 
 	unsigned int UserCount;			/* How many users are on this server? [note: doesn't care about +i] */
-	unsigned int OperCount;			/* How many opers are on this server? */
+	unsigned int OperCount = 0;			/* How many opers are on this server? */
 
 	/** We use this constructor only to create the 'root' item, Utils->TreeRoot, which
 	 * represents our own server. Therefore, it has no route, no parent, and
@@ -157,11 +157,11 @@ class TreeServer : public Server
 
 	/** Round trip time of last ping
 	 */
-	unsigned long rtt;
+	unsigned long rtt = 0;
 
 	/** When we received BURST from this server, used to calculate total burst time at ENDBURST.
 	 */
-	uint64_t StartBurst;
+	uint64_t StartBurst = 0;
 
 	/** True if this server is hidden
 	 */
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 8f59fb3ba..36cde5715 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -99,14 +99,18 @@ class TreeSocket : public BufferedSocket
 	std::string linkID;			/* Description for this link */
 	ServerState LinkState;			/* Link state */
 	CapabData* capab;			/* Link setup data (held until burst is sent) */
-	TreeServer* MyRoot;			/* The server we are talking to */
-	unsigned int proto_version;			/* Remote protocol version */
+
+	/* The server we are talking to */
+	TreeServer* MyRoot = NULL;
+
+	/* Remote protocol version */
+	unsigned int proto_version = 0;
 
 	/** True if we've sent our burst.
 	 * This only changes the behavior of message translation for 1202 protocol servers and it can be
 	 * removed once 1202 support is dropped.
 	 */
-	bool burstsent;
+	bool burstsent = false;
 
 	/** Checks if the given servername and sid are both free
 	 */
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 6119b1d38..9e4dd5ddd 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -40,8 +40,9 @@
  * and only do minor initialization tasks ourselves.
  */
 TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const irc::sockets::sockaddrs& dest)
-	: linkID(link->Name), LinkState(CONNECTING), MyRoot(NULL), proto_version(0)
-	, burstsent(false), age(ServerInstance->Time())
+	: linkID(link->Name)
+	, LinkState(CONNECTING)
+	, age(ServerInstance->Time())
 {
 	capab = new CapabData;
 	capab->link = link;
@@ -77,8 +78,9 @@ TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const irc::sockets::sockad
  */
 TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 	: BufferedSocket(newfd)
-	, linkID("inbound from " + client->addr()), LinkState(WAIT_AUTH_1), MyRoot(NULL), proto_version(0)
-	, burstsent(false), age(ServerInstance->Time())
+	, linkID("inbound from " + client->addr())
+	, LinkState(WAIT_AUTH_1)
+	, age(ServerInstance->Time())
 {
 	capab = new CapabData;
 	capab->capab_phase = 0;
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 33f605912..0f839efe7 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -107,8 +107,7 @@ TreeServer* SpanningTreeUtilities::FindRouteTarget(const std::string& target)
 }
 
 SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
-	: Creator(C), TreeRoot(NULL)
-	, PingFreq(60) // XXX: TreeServer constructor reads this and TreeRoot is created before the config is read, so init it to something (value doesn't matter) to avoid a valgrind warning in TimerManager on unload
+	: Creator(C)
 {
 	ServerInstance->Timers.AddTimer(&RefreshTimer);
 }
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index eb9d76652..01c474f8e 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -86,7 +86,7 @@ class SpanningTreeUtilities : public classbase
 	unsigned int PingWarnTime;
 	/** This variable represents the root of the server tree
 	 */
-	TreeServer *TreeRoot;
+	TreeServer *TreeRoot = nullptr;
 	/** IPs allowed to link to us
 	 */
 	std::vector<std::string> ValidIPs;
@@ -107,8 +107,12 @@ class SpanningTreeUtilities : public classbase
 	std::vector<reference<Autoconnect> > AutoconnectBlocks;
 
 	/** Ping frequency of server to server links
+	 * XXX: TreeServer constructor reads this and TreeRoot is created before the
+	 * config is read, so init it to something (value doesn't matter) to avoid a
+	 * valgrind warning in TimerManager on unload
 	 */
-	unsigned int PingFreq;
+	unsigned int PingFreq = 60;
+	
 
 	/** Initialise utility class
 	 */