Really clever VOODOO.

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 7eb4544fbf58c3ff337998dc2cb7d36e4775f801..d96c068ed445e8693c63b45392d7dcaceb284a74 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -2,14 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -32,11 +29,15 @@ static time_t LAST = 0;
  */
 void InspIRCd::Log(int level, const char* text, ...)
 {
+       /* Do this check again here so that we save pointless vsnprintf calls */
+       if ((level < Config->LogLevel) && !Config->forcedebug)
+               return;
+
        va_list argsPtr;
-       char textbuffer[MAXBUF];
+       char textbuffer[65536];
 
        va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       vsnprintf(textbuffer, 65536, text, argsPtr);
        va_end(argsPtr);
 
        this->Log(level, std::string(textbuffer));
@@ -311,13 +312,7 @@ int InspIRCd::UserCount()
 int InspIRCd::RegisteredUserCount()
 {
        int c = 0;
-
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-       {
-               c += (i->second->registered == REG_ALL);
-       }
-
-       return c;
+       return this->UnregisteredUserCount() - clientlist.size();
 }
 
 int InspIRCd::InvisibleUserCount()
@@ -506,18 +501,18 @@ void InspIRCd::LoadAllModules()
        this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1);
 }
 
-void InspIRCd::SendWhoisLine(userrec* user, int numeric, const std::string &text)
+void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text)
 {
        std::string copy_text = text;
 
        int MOD_RESULT = 0;
-       FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, numeric, copy_text));
+       FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text));
 
        if (!MOD_RESULT)
                user->WriteServ("%d %s", numeric, copy_text.c_str());
 }
 
-void InspIRCd::SendWhoisLine(userrec* user, int numeric, const char* format, ...)
+void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -525,6 +520,6 @@ void InspIRCd::SendWhoisLine(userrec* user, int numeric, const char* format, ...
        vsnprintf(textbuffer, MAXBUF, format, argsPtr);
        va_end(argsPtr);
 
-       this->SendWhoisLine(user, numeric, std::string(textbuffer));
+       this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
 }