Replace some C-isms with C++-isms.

[user/henk/code/inspircd.git] / src / usermanager.cpp

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index ba1f5f9e6b34f4b9db6f99b9617a0a426c53e3dc..8ed87a338015230a2da8ddb6aaa036eacb248cca 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -326,18 +326,17 @@ void UserManager::ServerNoticeAll(const char* 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);
+       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(std::string(formatbuffer));
+               t->WriteServ(message);
        }
 }
 
@@ -347,18 +346,17 @@ void UserManager::ServerPrivmsgAll(const char* 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);
+       const std::string message = "PRIVMSG $" + ServerInstance->Config->ServerName + " :" + textbuffer;
 
        for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                User* t = *i;
-               t->WriteServ(std::string(formatbuffer));
+               t->WriteServ(message);
        }
 }