Change return type of Channel::GetUsers() to reference from pointer as it is never NULL

2 files changed, 4 insertions, 5 deletions

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index f96e47d60..f583a9d8f 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -167,9 +167,9 @@ void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
 void TreeSocket::SendFJoins(Channel* c)
 {
 	CommandFJoin::Builder fjoin(c);
-	const UserMembList *ulist = c->GetUsers();
 
-	for (UserMembCIter i = ulist->begin(); i != ulist->end(); ++i)
+	const UserMembList& ulist = c->GetUsers();
+	for (UserMembCIter i = ulist.begin(); i != ulist.end(); ++i)
 	{
 		Membership* memb = i->second;
 		if (!fjoin.has_room(memb))
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index d6dccba14..254b50dcc 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -166,9 +166,8 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
 			minrank = mh->GetPrefixRank();
 	}
 
-	const UserMembList *ulist = c->GetUsers();
-
-	for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
+	const UserMembList& ulist = c->GetUsers();
+	for (UserMembCIter i = ulist.begin(); i != ulist.end(); ++i)
 	{
 		if (IS_LOCAL(i->first))
 			continue;