From 39d2c7c6dfdc88097e5e06d63f7d906e28054469 Mon Sep 17 00:00:00 2001 From: om Date: Fri, 7 Apr 2006 23:16:45 +0000 Subject: Make WriteServ use WriteServ_NoFormat, code duplication = bad >:/ Change some weirdness using a stringstream for a simple append. Force a flush of all opers' write buffers after they get the oper notice about a /DIE git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3842 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/helperfuncs.cpp | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'src/helperfuncs.cpp') diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 46a85da2c..c467172d8 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -293,31 +293,8 @@ void WriteServ(int sock, char* text, ...) va_start(argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer); - chop(tb); - - if (fd_ref_table[sock]) - { - if (Config->GetIOHook(fd_ref_table[sock]->port)) - { - try - { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); - } - catch (ModuleException& modexcept) - { - log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); - } - } - else - { - fd_ref_table[sock]->AddWriteBuf(tb); - } - - ServerInstance->stats->statsSent += bytes; - } - else - log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); + + WriteServ_NoFormat(sock, textbuffer); } /** WriteFrom_NoFormat() -- cgit v1.3.1-10-gc9f91