Removed a lot of unnecessary .c_str() calls in the find* functions

18 files changed, 37 insertions, 38 deletions

diff --git a/src/core/bs_act.cpp b/src/core/bs_act.cpp
index 1bf11e078..da921b47a 100644
--- a/src/core/bs_act.cpp
+++ b/src/core/bs_act.cpp
@@ -23,7 +23,7 @@ class CommandBSAct : public Command
 
 	CommandReturn Execute(User *u, const std::vector<ci::string> &params)
 	{
-		ChannelInfo *ci = cs_findchan(params[0].c_str());
+		ChannelInfo *ci = cs_findchan(params[0]);
 		ci::string message = params[1];
 
 		if (!check_access(u, ci, CA_SAY))
diff --git a/src/core/cs_akick.cpp b/src/core/cs_akick.cpp
index 0333a5042..047ec2cd4 100644
--- a/src/core/cs_akick.cpp
+++ b/src/core/cs_akick.cpp
@@ -171,7 +171,7 @@ class CommandCSAKick : public Command
 	{
 		ci::string mask = params[2];
 		ci::string reason = params.size() > 3 ? params[3] : "";
-		NickAlias *na = findnick(mask.c_str());
+		NickAlias *na = findnick(mask);
 		NickCore *nc = NULL;
 		AutoKick *akick;
 
@@ -300,7 +300,7 @@ class CommandCSAKick : public Command
 		        return;
 		}
 
-		na = findnick(mask.c_str());
+		na = findnick(mask);
 		nc = (na ? na->nc : NULL);
 
 		for (i = 0; i < ci->GetAkickCount(); ++i)
@@ -340,7 +340,7 @@ class CommandCSAKick : public Command
 		        return;
 		}
 
-		na = findnick(mask.c_str());
+		na = findnick(mask);
 		nc = (na ? na->nc : NULL);
 
 		for (i = 0; i < ci->GetAkickCount(); ++i)
@@ -380,7 +380,7 @@ class CommandCSAKick : public Command
 			(new AkickDelCallback(u, ci, mask.c_str()))->Process();
 		else
 		{
-		        NickAlias *na = findnick(mask.c_str());
+		        NickAlias *na = findnick(mask);
 		        NickCore *nc = (na ? na->nc : NULL);
 
 			for (i = 0; i < ci->GetAkickCount(); ++i)
@@ -530,7 +530,7 @@ class CommandCSAKick : public Command
 		ci::string cmd = params[1];
 		ci::string mask = params.size() > 2 ? params[2] : "";
 
-		ChannelInfo *ci = cs_findchan(chan.c_str());
+		ChannelInfo *ci = cs_findchan(chan);
 
 		if (mask.empty() && (cmd == "ADD" || cmd == "STICK" || cmd == "UNSTICK" || cmd == "DEL"))
 			this->OnSyntaxError(u, cmd);
diff --git a/src/core/cs_forbid.cpp b/src/core/cs_forbid.cpp
index 141865bf7..ad9881782 100644
--- a/src/core/cs_forbid.cpp
+++ b/src/core/cs_forbid.cpp
@@ -64,7 +64,7 @@ class CommandCSForbid : public Command
 		if (reason)
 			ci->forbidreason = sstrdup(reason);
 
-		if ((c = findchan(ci->name.c_str())))
+		if ((c = findchan(ci->name)))
 		{
 			/* Before banning everyone, it might be prudent to clear +e and +I lists..
 			 * to prevent ppl from rejoining.. ~ Viper */
diff --git a/src/core/cs_invite.cpp b/src/core/cs_invite.cpp
index 2abcf82bb..bf243080f 100644
--- a/src/core/cs_invite.cpp
+++ b/src/core/cs_invite.cpp
@@ -46,7 +46,7 @@ class CommandCSInvite : public Command
 			u2 = u;
 		else
 		{
-			if (!(u2 = finduser(params[1].c_str())))
+			if (!(u2 = finduser(params[1])))
 			{
 				notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, params[1].c_str());
 				return MOD_CONT;
diff --git a/src/core/cs_set.cpp b/src/core/cs_set.cpp
index 07171bdc1..71136bc2b 100644
--- a/src/core/cs_set.cpp
+++ b/src/core/cs_set.cpp
@@ -20,7 +20,7 @@ class CommandCSSet : public Command
  private:
 	CommandReturn DoSetFounder(User * u, ChannelInfo * ci, const ci::string &param)
 	{
-		NickAlias *na = findnick(param.c_str());
+		NickAlias *na = findnick(param);
 		NickCore *nc, *nc0 = ci->founder;
 
 		if (!na)
@@ -63,7 +63,7 @@ class CommandCSSet : public Command
 
 		if (!param.empty())
 		{
-			na = findnick(param.c_str());
+			na = findnick(param);
 
 			if (!na)
 			{
diff --git a/src/core/cs_suspend.cpp b/src/core/cs_suspend.cpp
index 654dd9711..426d44945 100644
--- a/src/core/cs_suspend.cpp
+++ b/src/core/cs_suspend.cpp
@@ -59,7 +59,7 @@ class CommandCSSuspend : public Command
 			if (reason)
 				ci->forbidreason = sstrdup(reason);
 
-			if ((c = findchan(ci->name.c_str())))
+			if ((c = findchan(ci->name)))
 			{
 				for (CUserList::iterator it = c->users.begin(); it != c->users.end();)
 				{
diff --git a/src/core/cs_unban.cpp b/src/core/cs_unban.cpp
index 0ae2077ed..9dd4e74e3 100644
--- a/src/core/cs_unban.cpp
+++ b/src/core/cs_unban.cpp
@@ -41,7 +41,7 @@ class CommandCSUnban : public Command
 
 		u2 = u;
 		if (params.size() > 1)
-			u2 = finduser(params[1].c_str());
+			u2 = finduser(params[1]);
 
 		if (!u2)
 		{
diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp
index 98212539e..8808539bd 100644
--- a/src/core/db_plain.cpp
+++ b/src/core/db_plain.cpp
@@ -93,17 +93,17 @@ static void ReadDatabase(Module *m = NULL)
 		{
 			if (params[0] == "NC")
 			{
-				nc = findcore(params[1].c_str());
+				nc = findcore(params[1]);
 				Type = MD_NC;
 			}
 			else if (params[0] == "NA")
 			{
-				na = findnick(params[2].c_str());
+				na = findnick(params[2]);
 				Type = MD_NA;
 			}
 			else if (params[0] == "NR")
 			{
-				nr = findrequestnick(params[1].c_str());
+				nr = findrequestnick(params[1]);
 				Type = MD_NR;
 			}
 			else if (params[0] == "BI")
@@ -390,7 +390,7 @@ static void LoadNickCore(const std::vector<std::string> &params)
 
 static void LoadNickAlias(const std::vector<std::string> &params)
 {
-	NickCore *nc = findcore(params[0].c_str());
+	NickCore *nc = findcore(params[0]);
 	if (!nc)
 	{
 		Alog() << "[db_plain]: Unable to find core " << params[0];
@@ -719,7 +719,7 @@ class DBPlain : public Module
 	{
 		if (key == "FOUNDER")
 		{
-			ci->founder = findcore(params[0].c_str());
+			ci->founder = findcore(params[0]);
 			if (!ci->founder)
 			{
 				std::stringstream reason;
@@ -728,7 +728,7 @@ class DBPlain : public Module
 			}
 		}
 		else if (key == "SUCCESSOR")
-			ci->successor = findcore(params[0].c_str());
+			ci->successor = findcore(params[0]);
 		else if (key == "LEVELS")
 		{
 			for (unsigned j = 0; j < params.size(); ++j, ++j)
@@ -762,7 +762,7 @@ class DBPlain : public Module
 		}
 		else if (key == "ACCESS")
 		{
-			NickCore *nc = findcore(params[0].c_str());
+			NickCore *nc = findcore(params[0]);
 			if (!nc)
 			{
 				std::stringstream reason;
@@ -781,7 +781,7 @@ class DBPlain : public Module
 			NickCore *nc = NULL;
 			if (Nick)
 			{
-				nc = findcore(params[2].c_str());
+				nc = findcore(params[2]);
 				if (!nc)
 				{
 					std::stringstream reason;
diff --git a/src/core/ms_del.cpp b/src/core/ms_del.cpp
index 700df16b4..7fd5138b5 100644
--- a/src/core/ms_del.cpp
+++ b/src/core/ms_del.cpp
@@ -62,7 +62,7 @@ class CommandMSDel : public Command
 			chan = numstr;
 			numstr = params.size() > 1 ? params[1] : "";
 
-			if (!(ci = cs_findchan(chan.c_str())))
+			if (!(ci = cs_findchan(chan)))
 			{
 				notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
diff --git a/src/core/ms_list.cpp b/src/core/ms_list.cpp
index 066d69775..22ffb93c0 100644
--- a/src/core/ms_list.cpp
+++ b/src/core/ms_list.cpp
@@ -74,7 +74,7 @@ class CommandMSList : public Command
 			chan = param;
 			param = params.size() > 1 ? params[1] : "";
 
-			if (!(ci = cs_findchan(chan.c_str())))
+			if (!(ci = cs_findchan(chan)))
 			{
 				notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
diff --git a/src/core/ms_read.cpp b/src/core/ms_read.cpp
index 8368bf57f..0347ba020 100644
--- a/src/core/ms_read.cpp
+++ b/src/core/ms_read.cpp
@@ -70,7 +70,7 @@ class CommandMSRead : public Command
 			chan = numstr;
 			numstr = params.size() > 1 ? params[1] : "";
 
-			if (!(ci = cs_findchan(chan.c_str())))
+			if (!(ci = cs_findchan(chan)))
 			{
 				notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
diff --git a/src/core/ms_set.cpp b/src/core/ms_set.cpp
index bac493ade..9171b0f21 100644
--- a/src/core/ms_set.cpp
+++ b/src/core/ms_set.cpp
@@ -83,7 +83,7 @@ class CommandMSSet : public Command
 			p1 = p2;
 			p2 = p3;
 			p3 = params.size() > 4 ? params[4] : "";
-			if (!(ci = cs_findchan(chan.c_str())))
+			if (!(ci = cs_findchan(chan)))
 			{
 				notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str());
 				return MOD_CONT;
@@ -100,7 +100,7 @@ class CommandMSSet : public Command
 			if (!p2.empty() && p2 != "HARD" && chan.empty())
 			{
 				NickAlias *na;
-				if (!(na = findnick(p1.c_str())))
+				if (!(na = findnick(p1)))
 				{
 					notice_lang(Config.s_MemoServ, u, NICK_X_NOT_REGISTERED, p1.c_str());
 					return MOD_CONT;
diff --git a/src/core/ns_access.cpp b/src/core/ns_access.cpp
index e64bc1b16..aa96c45b1 100644
--- a/src/core/ns_access.cpp
+++ b/src/core/ns_access.cpp
@@ -124,7 +124,7 @@ class CommandNSAccess : public Command
 		const char *mask = params.size() > 1 ? params[1].c_str() : NULL;
 		NickAlias *na;
 
-		if (cmd == "LIST" && u->Account()->IsServicesOper() && mask && (na = findnick(params[1].c_str())))
+		if (cmd == "LIST" && u->Account()->IsServicesOper() && mask && (na = findnick(params[1])))
 			return this->DoServAdminList(u, params, na->nc);
 
 		if (mask && !strchr(mask, '@'))
diff --git a/src/core/ns_group.cpp b/src/core/ns_group.cpp
index dd6f9b3be..f9811cad7 100644
--- a/src/core/ns_group.cpp
+++ b/src/core/ns_group.cpp
@@ -29,7 +29,7 @@ class CommandNSGroup : public Command
 		std::string pass = params[1].c_str();
 		std::list<std::pair<std::string, std::string> >::iterator it;
 
-		if (Config.NSEmailReg && findrequestnick(u->nick.c_str()))
+		if (Config.NSEmailReg && findrequestnick(u->nick))
 		{
 			notice_lang(Config.s_NickServ, u, NICK_REQUESTED);
 			return MOD_CONT;
diff --git a/src/core/ns_identify.cpp b/src/core/ns_identify.cpp
index bf8a4548f..c3e034f7a 100644
--- a/src/core/ns_identify.cpp
+++ b/src/core/ns_identify.cpp
@@ -29,9 +29,9 @@ class CommandNSIdentify : public Command
 		NickRequest *nr;
 		int res;
 
-		if (!(na = findnick(u->nick.c_str())))
+		if (!(na = findnick(u->nick)))
 		{
-			if ((nr = findrequestnick(u->nick.c_str())))
+			if ((nr = findrequestnick(u->nick)))
 				notice_lang(Config.s_NickServ, u, NICK_IS_PREREG);
 			else
 				notice_lang(Config.s_NickServ, u, NICK_NOT_REGISTERED);
diff --git a/src/core/ns_register.cpp b/src/core/ns_register.cpp
index beb2e26ac..791f2cad5 100644
--- a/src/core/ns_register.cpp
+++ b/src/core/ns_register.cpp
@@ -94,10 +94,9 @@ class CommandNSConfirm : public Command
 
 	CommandReturn DoConfirm(User *u, const std::vector<ci::string> &params)
 	{
-		NickRequest *nr = NULL;
 		std::string passcode = !params.empty() ? params[0].c_str() : "";
 
-		nr = findrequestnick(u->nick.c_str());
+		NickRequest *nr = findrequestnick(u->nick);
 
 		if (Config.NSEmailReg)
 		{
@@ -113,7 +112,7 @@ class CommandNSConfirm : public Command
 				{
 					/* If an admin, their nick is obviously already regged, so look at the passcode to get the nick
 					   of the user they are trying to validate, and push that user through regardless of passcode */
-					nr = findrequestnick(passcode.c_str());
+					nr = findrequestnick(passcode);
 					if (nr)
 					{
 						ActuallyConfirmNick(u, nr, true);
@@ -206,7 +205,7 @@ class CommandNSRegister : public CommandNSConfirm
 			return MOD_CONT;
 		}
 
-		if ((anr = findrequestnick(u->nick.c_str())))
+		if ((anr = findrequestnick(u->nick)))
 		{
 			notice_lang(Config.s_NickServ, u, NICK_REQUESTED);
 			return MOD_CONT;
@@ -247,7 +246,7 @@ class CommandNSRegister : public CommandNSConfirm
 			this->OnSyntaxError(u, "");
 		else if (time(NULL) < u->lastnickreg + Config.NSRegDelay)
 			notice_lang(Config.s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config.NSRegDelay) - time(NULL));
-		else if ((na = findnick(u->nick.c_str())))
+		else if ((na = findnick(u->nick)))
 		{
 			/* i.e. there's already such a nick regged */
 			if (na->HasFlag(NS_FORBIDDEN))
@@ -330,7 +329,7 @@ class CommandNSResend : public Command
 		NickRequest *nr = NULL;
 		if (Config.NSEmailReg)
 		{
-			if ((nr = findrequestnick(u->nick.c_str())))
+			if ((nr = findrequestnick(u->nick)))
 			{
 				if (time(NULL) < nr->lastmail + Config.NSResendDelay)
 				{
diff --git a/src/core/ns_resetpass.cpp b/src/core/ns_resetpass.cpp
index 42e38b108..53e284ada 100644
--- a/src/core/ns_resetpass.cpp
+++ b/src/core/ns_resetpass.cpp
@@ -29,7 +29,7 @@ class CommandNSResetPass : public Command
 
 		if (Config.RestrictMail && !u->Account()->HasCommand("nickserv/resetpass"))
 			notice_lang(Config.s_NickServ, u, ACCESS_DENIED);
-		if (!(na = findnick(params[0].c_str())))
+		if (!(na = findnick(params[0])))
 			notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, params[0].c_str());
 		else if (na->HasFlag(NS_FORBIDDEN))
 			notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
diff --git a/src/core/os_svsnick.cpp b/src/core/os_svsnick.cpp
index 83906794f..7f5f0e637 100644
--- a/src/core/os_svsnick.cpp
+++ b/src/core/os_svsnick.cpp
@@ -54,9 +54,9 @@ class CommandOSSVSNick : public Command
 		/* Check for a nick in use or a forbidden/suspended nick */
 		if (!(u2 = finduser(nick)))
 			notice_lang(Config.s_OperServ, u, NICK_X_NOT_IN_USE, nick);
-		else if (finduser(newnick.c_str()))
+		else if (finduser(newnick))
 			notice_lang(Config.s_OperServ, u, NICK_X_IN_USE, newnick.c_str());
-		else if ((na = findnick(newnick.c_str())) && (na->HasFlag(NS_FORBIDDEN)))
+		else if ((na = findnick(newnick)) && (na->HasFlag(NS_FORBIDDEN)))
 			notice_lang(Config.s_OperServ, u, NICK_X_FORBIDDEN, newnick.c_str());
 		else
 		{