X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=09c9a5bde2431f59bdc1c28a8732f4a3ba278078;hb=7a67685bcb863b0d4199715e86697fee423596c2;hp=8ed87a338015230a2da8ddb6aaa036eacb248cca;hpb=accccc212cd4f08a3c5532b1ae7a17e76bac8718;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 8ed87a338..09c9a5bde 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -322,36 +322,9 @@ unsigned int UserManager::LocalUserCount()
 
 void UserManager::ServerNoticeAll(const char* text, ...)
 {
-	if (!text)
-		return;
-
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	const std::string message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + textbuffer;
-
-	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-	{
-		User* t = *i;
-		t->WriteServ(message);
-	}
-}
-
-void UserManager::ServerPrivmsgAll(const char* text, ...)
-{
-	if (!text)
-		return;
-
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	const std::string message = "PRIVMSG $" + ServerInstance->Config->ServerName + " :" + 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++)
 	{
@@ -360,7 +333,6 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
 	}
 }
 
-
 /* return how many users have a given mode e.g. 'a' */
 int UserManager::ModeCount(const char mode)
 {