Fix valgrind issues and crashes on exit

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

diff --git a/src/whois.cpp b/src/whois.cpp
index fc24d0c8231463f2d3485492ccf960a93dbbe3b8..3f034334342bd3dd944c08b927d5574ff3c330c6 100644 (file)
--- a/src/whois.cpp
+++ b/src/whois.cpp
@@ -40,7 +40,7 @@ void InspIRCd::DoWhois(User* user, User* dest,unsigned long signon, unsigned lon
        }
        else
        {
-               this->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick.c_str(), dest->nick.c_str(), dest->server, this->GetServerDescription(dest->server).c_str());
+               this->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick.c_str(), dest->nick.c_str(), dest->server.c_str(), this->GetServerDescription(dest->server).c_str());
        }
 
        if (IS_AWAY(dest))
@@ -68,7 +68,7 @@ void InspIRCd::DoWhois(User* user, User* dest,unsigned long signon, unsigned lon
                }
        }
 
-       FOREACH_MOD_I(this, I_OnWhois,OnWhois(user,dest));
+       FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
 
        /*
         * We only send these if we've been provided them. That is, if hidewhois is turned off, and user is local, or