Removed NICKMAX and CHANMAX, replaced user->nick, c->name, and ci->name with std::string

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

1 files changed, 21 insertions, 21 deletions

diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 5f875b1c9..1b9db83b9 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -57,7 +57,7 @@ static int access_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 
 	if (!*sent_header)
 	{
-		notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name);
+		notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str());
 		*sent_header = 1;
 	}
 
@@ -92,7 +92,7 @@ static int access_view(User *u, int index, ChannelInfo *ci, int *sent_header)
 	
 	if (!*sent_header)
 	{
-		notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name);
+		notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str());
 		*sent_header = 1;
 	}
 
@@ -227,7 +227,7 @@ class CommandCSAccess : public Command
 
 				FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level));
 
-				alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name);
+				alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name.c_str());
 				notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display, chan, level);
 				return MOD_CONT;
 			}
@@ -243,8 +243,8 @@ class CommandCSAccess : public Command
 
 			FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level));
 
-			alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name);
-			notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level);
+			alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name.c_str());
+			notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name.c_str(), level);
 		}
 		else if (cmd == "DEL")
 		{
@@ -273,18 +273,18 @@ class CommandCSAccess : public Command
 					else if (count == 1)
 					{
 						last = atoi(nick);
-						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name);
+						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name.c_str());
 					}
 					else
-						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name);
+						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str());
 				}
 				else
 				{
-					alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan);
+					alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan);
 					if (deleted == 1)
-						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name);
+						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name.c_str());
 					else
-						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name);
+						notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name.c_str());
 				}
 			}
 			else
@@ -309,8 +309,8 @@ class CommandCSAccess : public Command
 				}
 				else
 				{
-					notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name);
-					alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), na->nick, access->nc->display, chan);
+					notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name.c_str());
+					alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, get_access(u, ci), na->nick, access->nc->display, chan);
 					access->nc = NULL;
 					access->in_use = 0;
 					deleted = 1;
@@ -356,7 +356,7 @@ class CommandCSAccess : public Command
 			if (!sent_header)
 				notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan);
 			else
-				notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name);
+				notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str());
 		}
 		else if (cmd == "VIEW")
 		{
@@ -382,7 +382,7 @@ class CommandCSAccess : public Command
 			if (!sent_header)
 				notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan);
 			else
-				notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name);
+				notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str());
 		}
 		else if (cmd == "CLEAR")
 		{
@@ -402,9 +402,9 @@ class CommandCSAccess : public Command
 
 			FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u));
 
-			notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name);
+			notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name.c_str());
 			alog("%s: %s!%s@%s (level %d) cleared access list on %s",
-				 Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host,
+				 Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host,
 				 get_access(u, ci), chan);
 
 		}
@@ -474,8 +474,8 @@ class CommandCSLevels : public Command
 					ci->levels[levelinfo[i].what] = level;
 
 					alog("%s: %s!%s@%s set level %s on channel %s to %d",
-						 Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host,
-						 levelinfo[i].name, ci->name, level);
+						 Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host,
+						 levelinfo[i].name, ci->name.c_str(), level);
 					notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_CHANGED,
 								levelinfo[i].name, chan, level);
 					return MOD_CONT;
@@ -490,8 +490,8 @@ class CommandCSLevels : public Command
 					ci->levels[levelinfo[i].what] = ACCESS_INVALID;
 
 					alog("%s: %s!%s@%s disabled level %s on channel %s",
-						 Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host,
-						 levelinfo[i].name, ci->name);
+						 Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host,
+						 levelinfo[i].name, ci->name.c_str());
 					notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_DISABLED,
 								levelinfo[i].name, chan);
 					return MOD_CONT;
@@ -537,7 +537,7 @@ class CommandCSLevels : public Command
 			reset_levels(ci);
 
 			alog("%s: %s!%s@%s reset levels definitions on channel %s",
-				 Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name);
+				 Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ci->name.c_str());
 			notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_RESET, chan);
 		} else {
 			this->OnSyntaxError(u, "");