Made mlock_on, mlock_off, access, and akick private in ChannelInfo

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2630 5417fbe8-f217-4b02-8779-1006273d7864

5 files changed, 47 insertions, 51 deletions

diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index f784b3406..cd8ccb0cf 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -40,7 +40,7 @@ static int access_del_callback(User * u, int num, va_list args)
 	int *last = va_arg(args, int *);
 	int *perm = va_arg(args, int *);
 	int uacc = va_arg(args, int);
-	if (num < 1 || num > ci->access.size())
+	if (num < 1 || num > ci->GetAccessCount())
 		return 0;
 	*last = num;
 	return access_del(u, ci, ci->GetAccess(num - 1), perm, uacc);
@@ -75,7 +75,7 @@ static int access_list_callback(User * u, int num, va_list args)
 {
 	ChannelInfo *ci = va_arg(args, ChannelInfo *);
 	int *sent_header = va_arg(args, int *);
-	if (num < 1 || num > ci->access.size())
+	if (num < 1 || num > ci->GetAccessCount())
 		return 0;
 	return access_list(u, num - 1, ci, sent_header);
 }
@@ -232,7 +232,7 @@ class CommandCSAccess : public Command
 				return MOD_CONT;
 			}
 
-			if (ci->access.size() >= CSAccessMax)
+			if (ci->GetAccessCount() >= CSAccessMax)
 			{
 				notice_lang(s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT, CSAccessMax);
 				return MOD_CONT;
@@ -255,7 +255,7 @@ class CommandCSAccess : public Command
 				return MOD_CONT;
 			}
 
-			if (ci->access.empty())
+			if (!ci->GetAccessCount())
 			{
 				notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
 				return MOD_CONT;
@@ -331,7 +331,7 @@ class CommandCSAccess : public Command
 		{
 			int sent_header = 0;
 
-			if (ci->access.empty())
+			if (!ci->GetAccessCount())
 			{
 				notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
 				return MOD_CONT;
@@ -340,7 +340,7 @@ class CommandCSAccess : public Command
 				process_numlist(nick, NULL, access_list_callback, u, ci, &sent_header);
 			else
 			{
-				for (i = 0; i < ci->access.size(); i++)
+				for (i = 0; i < ci->GetAccessCount(); i++)
 				{
 					access = ci->GetAccess(i);
 					if (nick && access->nc && !Anope::Match(access->nc->display, nick, false))
@@ -357,7 +357,7 @@ class CommandCSAccess : public Command
 		{
 			int sent_header = 0;
 
-			if (ci->access.empty())
+			if (!ci->GetAccessCount())
 			{
 				notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
 				return MOD_CONT;
@@ -366,7 +366,7 @@ class CommandCSAccess : public Command
 				process_numlist(nick, NULL, access_view_callback, u, ci, &sent_header);
 			else
 			{
-				for (i = 0; i < ci->access.size(); ++i)
+				for (i = 0; i < ci->GetAccessCount(); ++i)
 				{
 					access = ci->GetAccess(i);
 					if (nick && access->nc && !Anope::Match(access->nc->display, nick, false))
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index b68dbeec5..c93c3a0aa 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -53,17 +53,17 @@ int akick_del_callback(User * u, int num, va_list args)
 
 	*last = num;
 
-	if (num < 1 || num > ci->akick.size())
+	if (num < 1 || num > ci->GetAkickCount())
 		return 0;
 
-	ci->EraseAkick(ci->akick[num - 1]);
+	ci->EraseAkick(ci->GetAkick(num - 1));
 	return 1;
 }
 
 
 int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
-	AutoKick *akick = ci->akick[index];
+	AutoKick *akick = ci->GetAkick(index);
 
 	if (!(akick->flags & AK_USED))
 		return 0;
@@ -84,14 +84,14 @@ int akick_list_callback(User * u, int num, va_list args)
 {
 	ChannelInfo *ci = va_arg(args, ChannelInfo *);
 	int *sent_header = va_arg(args, int *);
-	if (num < 1 || num > ci->akick.size())
+	if (num < 1 || num > ci->GetAkickCount())
 		return 0;
 	return akick_list(u, num - 1, ci, sent_header);
 }
 
 int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
-	AutoKick *akick = ci->akick[index];
+	AutoKick *akick = ci->GetAkick(index);
 	char timebuf[64];
 	struct tm tm;
 
@@ -128,7 +128,7 @@ int akick_view_callback(User * u, int num, va_list args)
 {
 	ChannelInfo *ci = va_arg(args, ChannelInfo *);
 	int *sent_header = va_arg(args, int *);
-	if (num < 1 || num > ci->akick.size())
+	if (num < 1 || num > ci->GetAkickCount())
 		return 0;
 	return akick_view(u, num - 1, ci, sent_header);
 }
@@ -239,9 +239,9 @@ class CommandCSAKick : public Command
 			 }
 		}
 
-		for (unsigned j = 0; j < ci->akick.size(); ++j)
+		for (unsigned j = 0; j < ci->GetAkickCount(); ++j)
 		{
-			akick = ci->akick[j];
+			akick = ci->GetAkick(j);
 			if (!(akick->flags & AK_USED))
 				continue;
 			if ((akick->flags & AK_ISNICK) ? akick->nc == nc : akick->mask == mask)
@@ -254,7 +254,7 @@ class CommandCSAKick : public Command
 
 		/* All entries should be in use so we don't have to go over
 		* the entire list. We simply add new entries at the end. */
-		if (ci->akick.size() >= CSAutokickMax)
+		if (ci->GetAkickCount() >= CSAutokickMax)
 		{
 			 notice_lang(s_ChanServ, u, CHAN_AKICK_REACHED_LIMIT, CSAutokickMax);
 			 return;
@@ -278,7 +278,7 @@ class CommandCSAKick : public Command
 		unsigned i;
 		AutoKick *akick;
 
-		if (ci->akick.empty())
+		if (!ci->GetAkickCount())
 		{
 		        notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
 		        return;
@@ -287,9 +287,9 @@ class CommandCSAKick : public Command
 		na = findnick(mask.c_str());
 		nc = (na ? na->nc : NULL);
 
-		for (i = 0; i < ci->akick.size(); ++i)
+		for (i = 0; i < ci->GetAkickCount(); ++i)
 		{
-			akick = ci->akick[i];
+			akick = ci->GetAkick(i);
 
 		        if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
 		                continue;
@@ -297,7 +297,8 @@ class CommandCSAKick : public Command
 		                break;
 		}
 
-		if (i == ci->akick.size()) {
+		if (i == ci->GetAkickCount())
+		{
 		        notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name);
 		        return;
 		}
@@ -317,7 +318,7 @@ class CommandCSAKick : public Command
 		unsigned i;
 		ci::string mask = params[2];
 
-		if (ci->akick.empty())
+		if (!ci->GetAkickCount())
 		{
 		        notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
 		        return;
@@ -326,9 +327,9 @@ class CommandCSAKick : public Command
 		na = findnick(mask.c_str());
 		nc = (na ? na->nc : NULL);
 
-		for (i = 0; i < ci->akick.size(); ++i)
+		for (i = 0; i < ci->GetAkickCount(); ++i)
 		{
-			akick = ci->akick[i];
+			akick = ci->GetAkick(i);
 
 		        if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
 		                continue;
@@ -336,7 +337,7 @@ class CommandCSAKick : public Command
 		                break;
 		}
 
-		if (i == ci->akick.size())
+		if (i == ci->GetAkickCount())
 		{
 		        notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name);
 		        return;
@@ -352,7 +353,7 @@ class CommandCSAKick : public Command
 		AutoKick *akick;
 		unsigned i;
 
-		if (ci->akick.empty())
+		if (!ci->GetAkickCount())
 		{
 		        notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
 		        return;
@@ -382,9 +383,9 @@ class CommandCSAKick : public Command
 		        NickAlias *na = findnick(mask.c_str());
 		        NickCore *nc = (na ? na->nc : NULL);
 
-			for (i = 0; i < ci->akick.size(); ++i)
+			for (i = 0; i < ci->GetAkickCount(); ++i)
 			{
-				akick = ci->akick[i];
+				akick = ci->GetAkick(i);
 
 				if (!(akick->flags & AK_USED))
 					continue;
@@ -394,7 +395,7 @@ class CommandCSAKick : public Command
 					break;
 			}
 			
-			if (i == ci->akick.size())
+			if (i == ci->GetAkickCount())
 			{
 			                notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name);
 			                return;
@@ -413,7 +414,7 @@ class CommandCSAKick : public Command
 		unsigned i;
 		AutoKick *akick;
 
-		if (ci->akick.empty())
+		if (!ci->GetAkickCount())
 		{
 		        notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
 		        return;
@@ -423,9 +424,9 @@ class CommandCSAKick : public Command
 			process_numlist(mask.c_str(), NULL, akick_list_callback, u, ci, &sent_header);
 		else
 		{
-			for (i = 0; i < ci->akick.size(); ++i)
+			for (i = 0; i < ci->GetAkickCount(); ++i)
 			{
-				akick = ci->akick[i];
+				akick = ci->GetAkick(i);
 
 				if (!(akick->flags & AK_USED))
 					continue;
@@ -452,7 +453,7 @@ class CommandCSAKick : public Command
 		AutoKick *akick;
 		unsigned i;
 
-		if (ci->akick.empty())
+		if (!ci->GetAkickCount())
 		{
 		        notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
 		        return;
@@ -462,9 +463,9 @@ class CommandCSAKick : public Command
 		        process_numlist(mask.c_str(), NULL, akick_view_callback, u, ci, &sent_header);
 		else
 		{
-			for (i = 0; i < ci->akick.size(); ++i)
+			for (i = 0; i < ci->GetAkickCount(); ++i)
 			{
-				akick = ci->akick[i];
+				akick = ci->GetAkick(i);
 
 		                if (!(akick->flags & AK_USED))
 					continue;
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index d0f6f3765..3b1137766 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -62,14 +62,9 @@ class CommandCSRegister : public Command
 		{
 			c->ci = ci;
 			ci->c = c;
-			ci->bantype = CSDefBantype;
-			ci->flags = CSDefFlags;
-			ci->mlock_on = ircd->DefMLock;
-			ci->memos.memomax = MSMaxMemos;
-			ci->last_used = ci->time_registered;
 			ci->founder = u->nc;
-
 			ci->desc = sstrdup(desc);
+
 			if (c->topic)
 			{
 				ci->last_topic = sstrdup(c->topic);
@@ -77,8 +72,8 @@ class CommandCSRegister : public Command
 				ci->last_topic_time = c->topic_time;
 			}
 			else strscpy(ci->last_topic_setter, s_ChanServ, NICKMAX); /* Set this to something, otherwise it will maliform the topic */
+
 			ci->bi = NULL;
-			ci->botflags = BSDefFlags;
 			++ci->founder->channelcount;
 			alog("%s: Channel '%s' registered by %s!%s@%s", s_ChanServ, chan, u->nick, u->GetIdent().c_str(), u->host);
 			notice_lang(s_ChanServ, u, CHAN_REGISTERED, chan, u->nick);
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 17955dbf2..d04969f9f 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -431,7 +431,7 @@ class CommandCSSet : public Command
 			if (!(ci->flags & CI_XOP)) {
 				ChanAccess *access;
 
-				for (unsigned i = 0; i < ci->access.size(); i++) {
+				for (unsigned i = 0; i < ci->GetAccessCount(); i++) {
 					access = ci->GetAccess(i);
 					if (!access->in_use)
 						continue;
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 4e15ac2fc..e79cb6515 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -171,7 +171,7 @@ class XOPBase : public Command
 			++change;
 		}
 
-		if (!change && ci->access.size() >= CSAccessMax)
+		if (!change && ci->GetAccessCount() >= CSAccessMax)
 		{
 			notice_lang(s_ChanServ, u, CHAN_XOP_REACHED_LIMIT, CSAccessMax);
 			return MOD_CONT;
@@ -224,7 +224,7 @@ class XOPBase : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->access.empty())
+		if (!ci->GetAccessCount())
 		{
 			notice_lang(s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name);
 			return MOD_CONT;
@@ -315,7 +315,7 @@ class XOPBase : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->access.empty())
+		if (!ci->GetAccessCount())
 		{
 			notice_lang(s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name);
 			return MOD_CONT;
@@ -325,7 +325,7 @@ class XOPBase : public Command
 			process_numlist(nick, NULL, xop_list_callback, u, ci, &sent_header, level, messages[XOP_LIST_HEADER]);
 		else
 		{
-			for (unsigned i = 0; i < ci->access.size(); ++i)
+			for (unsigned i = 0; i < ci->GetAccessCount(); ++i)
 			{
 				ChanAccess *access = ci->GetAccess(i);
 				if (nick && access->nc && !Anope::Match(access->nc->display, nick, false))
@@ -347,7 +347,7 @@ class XOPBase : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->access.empty())
+		if (!ci->GetAccessCount())
 		{
 			notice_lang(s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name);
 			return MOD_CONT;
@@ -359,7 +359,7 @@ class XOPBase : public Command
 			return MOD_CONT;
 		}
 
-		for (unsigned i = ci->access.size(); i > 0; --i)
+		for (unsigned i = ci->GetAccessCount(); i > 0; --i)
 		{
 			ChanAccess *access = ci->GetAccess(i - 1);
 			if (access->in_use && access->level == level)
@@ -590,7 +590,7 @@ int xop_del_callback(User *u, int num, va_list args)
 	int uacc = va_arg(args, int);
 	int xlev = va_arg(args, int);
 
-	if (num < 1 || num > ci->access.size())
+	if (num < 1 || num > ci->GetAccessCount())
 		return 0;
 	*last = num;
 
@@ -622,7 +622,7 @@ int xop_list_callback(User *u, int num, va_list args)
 	int xlev = va_arg(args, int);
 	int xmsg = va_arg(args, int);
 
-	if (num < 1 || num > ci->access.size())
+	if (num < 1 || num > ci->GetAccessCount())
 		return 0;
 
 	return xop_list(u, num - 1, ci, sent_header, xlev, xmsg);