2 files changed, 22 insertions, 43 deletions

diff --git a/src/botserv.cpp b/src/botserv.cpp
index ee6f08f29..c00b9c6fe 100644
--- a/src/botserv.cpp
+++ b/src/botserv.cpp
@@ -143,7 +143,7 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
 			bot_kick(ci, u, BOT_REASON_REVERSE);
 			return;
 		}
-		
+
 		/* Italics kicker */
 		if (ci->botflags.HasFlag(BS_KICK_ITALICS) && realbuf.find(29) != Anope::string::npos)
 		{
@@ -386,48 +386,34 @@ BotInfo *findbot(const Anope::string &nick)
 
 static BanData *get_ban_data(Channel *c, User *u)
 {
-	BanData *bd, *next;
-	time_t now = time(NULL);
-
 	if (!c || !u)
 		return NULL;
 
 	Anope::string mask = u->GetIdent() + "@" + u->GetDisplayedHost();
-
-	for (bd = c->bd; bd; bd = next)
+	time_t now = time(NULL);
+	for (std::list<BanData *>::iterator it = c->bd.begin(), it_end = c->bd.end(); it != it_end; ++it)
 	{
-		if (now - bd->last_use > Config->BSKeepData)
+		if (now - (*it)->last_use > Config->BSKeepData)
 		{
-			if (bd->next)
-				bd->next->prev = bd->prev;
-			if (bd->prev)
-				bd->prev->next = bd->next;
-			else
-				c->bd = bd->next;
-			next = bd->next;
-			delete bd;
+			delete *it;
+			c->bd.erase(it);
 			continue;
 		}
-		if (bd->mask.equals_ci(mask))
+		if ((*it)->mask.equals_ci(mask))
 		{
-			bd->last_use = now;
-			return bd;
+			(*it)->last_use = now;
+			return *it;
 		}
-		next = bd->next;
 	}
 
 	/* If we fall here it is that we haven't found the record */
-	bd = new BanData;
+	BanData *bd = new BanData();
 	bd->mask = mask;
 	bd->last_use = now;
 	for (int x = 0; x < TTB_SIZE; ++x)
 		bd->ttb[x] = 0;
 
-	bd->prev = NULL;
-	bd->next = c->bd;
-	if (bd->next)
-		bd->next->prev = bd;
-	c->bd = bd;
+	c->bd.push_front(bd);
 
 	return bd;
 }
diff --git a/src/channels.cpp b/src/channels.cpp
index 29cc2c895..55de669fd 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -19,25 +19,24 @@ channel_map ChannelList;
  * @param name The channel name
  * @param ts The time the channel was created
  */
-Channel::Channel(const Anope::string &name, time_t ts)
+Channel::Channel(const Anope::string &nname, time_t ts)
 {
-	if (name.empty())
+	if (nname.empty())
 		throw CoreException("A channel without a name ?");
 
-	this->name = name;
+	this->name = nname;
 
 	ChannelList[this->name] = this;
 
 	this->creation_time = ts;
 	this->bans = this->excepts = this->invites = NULL;
-	this->bd = NULL;
 	this->server_modetime = this->chanserv_modetime = 0;
 	this->server_modecount = this->chanserv_modecount = this->bouncy_modes = this->topic_sync = this->topic_time = 0;
 
 	this->ci = cs_findchan(this->name);
 	if (this->ci)
 		this->ci->c = this;
-	
+
 	Log(NULL, this, "create");
 
 	FOREACH_MOD(I_OnChannelCreate, OnChannelCreate(this));
@@ -47,17 +46,12 @@ Channel::Channel(const Anope::string &name, time_t ts)
  */
 Channel::~Channel()
 {
-	BanData *bd, *next;
-
 	FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
 
 	Log(NULL, this, "destroy");
 
-	for (bd = this->bd; bd; bd = next)
-	{
-		next = bd->next;
-		delete bd;
-	}
+	for (std::list<BanData *>::iterator it = this->bd.begin(), it_end = this->bd.end(); it != it_end; ++it)
+		delete *it;
 
 	if (this->ci)
 		this->ci->c = NULL;
@@ -93,7 +87,7 @@ void Channel::Reset()
 
 		uc->Status->ClearFlags();
 	}
-	
+
 	check_modes(this);
 	for (CUserList::const_iterator it = this->users.begin(), it_end = this->users.end(); it != it_end; ++it)
 		chan_set_correct_modes((*it)->user, this, 1);
@@ -1039,7 +1033,6 @@ Channel *findchan(const Anope::string &chan)
 void get_channel_stats(long *nrec, long *memuse)
 {
 	long count = 0, mem = 0;
-	BanData *bd;
 	Anope::string buf;
 
 	for (channel_map::const_iterator cit = ChannelList.begin(); cit != ChannelList.end(); ++cit)
@@ -1068,11 +1061,11 @@ void get_channel_stats(long *nrec, long *memuse)
 			if (!(*it)->ud.lastline.empty())
 				mem += (*it)->ud.lastline.length() + 1;
 		}
-		for (bd = chan->bd; bd; bd = bd->next)
+		for (std::list<BanData *>::iterator it = chan->bd.begin(), it_end = chan->bd.end(); it != it_end; ++it)
 		{
-			if (!bd->mask.empty())
-				mem += bd->mask.length() + 1;
-			mem += sizeof(*bd);
+			if (!(*it)->mask.empty())
+				mem += (*it)->mask.length() + 1;
+			mem += sizeof(*it);
 		}
 	}
 	*nrec = count;