X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=cdc59438730f19cc912623d49bfd759612c3eb60;hb=ee641f3f229143940fbe359ac98863edfdf249ce;hp=ba1f5f9e6b34f4b9db6f99b9617a0a426c53e3dc;hpb=226a95aab09b9e1f43f61e78179bfa1135816c2d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index ba1f5f9e6..cdc594387 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -37,7 +37,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	}
 	catch (...)
 	{
-		ServerInstance->Logs->Log("USERS", LOG_DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
+		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
 		ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
 		return;
 	}
@@ -54,11 +54,11 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		}
 		catch (CoreException& modexcept)
 		{
-			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 	}
 
-	ServerInstance->Logs->Log("USERS", LOG_DEBUG,"New user fd: %d", socket);
+	ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New user fd: %d", socket);
 
 	this->unregistered_count++;
 
@@ -135,7 +135,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 
 	if (!ServerInstance->SE->AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
 	{
-		ServerInstance->Logs->Log("USERS", LOG_DEBUG,"Internal error on new connection");
+		ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Internal error on new connection");
 		this->QuitUser(New, "Internal error handling connection");
 	}
 
@@ -322,47 +322,17 @@ unsigned int UserManager::LocalUserCount()
 
 void UserManager::ServerNoticeAll(const char* text, ...)
 {
-	if (!text)
-		return;
-
-	char textbuffer[MAXBUF];
-	char formatbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
+	std::string message;
+	VAFORMAT(message, text, text);
+	message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + message;
 
 	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
 		User* t = *i;
-		t->WriteServ(std::string(formatbuffer));
+		t->WriteServ(message);
 	}
 }
 
-void UserManager::ServerPrivmsgAll(const char* text, ...)
-{
-	if (!text)
-		return;
-
-	char textbuffer[MAXBUF];
-	char formatbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
-
-	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-	{
-		User* t = *i;
-		t->WriteServ(std::string(formatbuffer));
-	}
-}
-
-
 /* return how many users have a given mode e.g. 'a' */
 int UserManager::ModeCount(const char mode)
 {