Next to convert

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9750 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 31 insertions, 31 deletions

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 94d99c374..50260920a 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -97,11 +97,11 @@ class CommandCBan : public Command
 		{
 			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed CBan on %s.",user->nick,parameters[0].c_str());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed CBan on %s.",user->nick.c_str(),parameters[0].c_str());
 			}
 			else
 			{
-				user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick,parameters[0].c_str());
+				user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick.c_str(),parameters[0].c_str());
 			}
 
 			return CMD_SUCCESS;
@@ -114,7 +114,7 @@ class CommandCBan : public Command
 
 			try
 			{
-				r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), parameters[0].c_str());
+				r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -127,12 +127,12 @@ class CommandCBan : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s.", user->nick, parameters[0].c_str());
+						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s.", user->nick.c_str(), parameters[0].c_str());
 					}
 					else
 					{
 						time_t c_requires_crap = duration + ServerInstance->Time();
-						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed CBan for %s, expires on %s", user->nick, parameters[0].c_str(),
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed CBan for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
 						ServerInstance->TimeString(c_requires_crap).c_str());
 					}
 
@@ -141,7 +141,7 @@ class CommandCBan : public Command
 				else
 				{
 					delete r;
-					user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick, parameters[0].c_str());
+					user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str());
 				}
 			}
 		}
@@ -184,8 +184,8 @@ class ModuleCBan : public Module
 		if (rl)
 		{
 			// Channel is banned.
-			user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, rl->reason);
-			ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick, cname, rl->reason);
+			user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason);
+			ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason);
 			return 1;
 		}
 
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 93fe3ae3b..0d73e6bac 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -115,7 +115,7 @@ class ModuleCensor : public Module
 			{
 				if (index->second.empty())
 				{
-					user->WriteNumeric(936, "%s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str());
+					user->WriteNumeric(936, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name, index->first.c_str());
 					return 1;
 				}
 				
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 51f74f31b..691c54184 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -75,7 +75,7 @@ class CommandWebirc : public Command
 						user->Extend("cgiirc_realhost", new std::string(user->host));
 						user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
 						if (notify)
-							ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2].c_str(), user->host);
+							ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host, parameters[2].c_str(), user->host);
 						user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
 						user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
 						return CMD_LOCALONLY;
@@ -108,11 +108,11 @@ class CGIResolver : public Resolver
 		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
 			if (notify)
-				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host, result.c_str(), typ.c_str());
 
 			strlcpy(them->host, result.c_str(), 63);
-			strlcpy(them->dhost, result.c_str(), 63);
-			strlcpy(them->ident, "~cgiirc", 8);
+			them->dhost.assign(result, 0, 63);
+			them->ident.assign("~cgiirc", 0, 8);
 			them->InvalidateCache();
 			them->CheckLines();
 		}
@@ -123,7 +123,7 @@ class CGIResolver : public Resolver
 		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
 			if (notify)
-				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host, typ.c_str());
 		}
 	}
 
@@ -303,7 +303,7 @@ public:
 		if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
 		{
 			strlcpy(user->host,webirc_hostname->c_str(),63);
-			strlcpy(user->dhost,webirc_hostname->c_str(),63);
+			user->dhost.assign(*webirc_hostname, 0, 63);
 			delete webirc_hostname;
 			user->InvalidateCache();
 			user->Shrink("cgiirc_webirc_hostname");
@@ -338,8 +338,8 @@ public:
 		{
 			user->Extend("cgiirc_realhost", new std::string(user->host));
 			user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
-			strlcpy(user->host, user->password, 64);
-			strlcpy(user->dhost, user->password, 64);
+			strlcpy(user->host, user->password.c_str(), 64);
+			user->dhost.assign(user->password, 0, 64);
 			user->InvalidateCache();
 
 			bool valid = false;
@@ -350,7 +350,7 @@ public:
 			else
 				valid = (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr));
 #else
-			if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr))
+			if (inet_aton(user->password.c_str(), &((sockaddr_in*)user->ip)->sin_addr))
 				valid = true;
 #endif
 			ServerInstance->Users->AddLocalClone(user);
@@ -361,7 +361,7 @@ public:
 			{
 				/* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */
 				if(NotifyOpers)
-					ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);
+					ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host, user->password.c_str());
 			}
 			else
 			{
@@ -376,11 +376,11 @@ public:
 				catch (...)
 				{
 					if (NotifyOpers)
-						ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick, user->host);
+						ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host);
 				}
 			}
 			
-			*user->password = 0;
+			user->password.clear();
 
 			/*if(NotifyOpers)
 				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/
@@ -394,14 +394,14 @@ public:
 	bool CheckIdent(User* user)
 	{
 		int ip[4];
-		char* ident;
+		const char* ident;
 		char newip[16];
-		int len = strlen(user->ident);
+		int len = user->ident.length();
 		
 		if(len == 8)
-			ident = user->ident;
-		else if(len == 9 && *user->ident == '~')
-			ident = user->ident+1;
+			ident = user->ident.c_str();
+		else if(len == 9 && user->ident[0] == '~')
+			ident = user->ident.c_str() + 1;
 		else
 			return false;
 	
@@ -426,8 +426,8 @@ public:
 		try
 		{
 			strlcpy(user->host, newip, 16);
-			strlcpy(user->dhost, newip, 16);
-			strlcpy(user->ident, "~cgiirc", 8);
+			user->dhost.assign(newip, 0, 16);
+			user->ident.assign("~cgiirc", 0, 8);
 
 			bool cached;
 			CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
@@ -436,12 +436,12 @@ public:
 		catch (...)
 		{
 			strlcpy(user->host, newip, 16);
-			strlcpy(user->dhost, newip, 16);
-			strlcpy(user->ident, "~cgiirc", 8);
+			user->dhost.assign(newip, 0, 16);
+			user->ident.assign("~cgiirc", 0, 8);
 			user->InvalidateCache();
 
 			if(NotifyOpers)
-				 ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick, user->host);
+				 ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host);
 		}
 		/*strlcpy(user->host, newip, 16);
 		strlcpy(user->dhost, newip, 16);