From d6c34d2441928875db2a21fb27b87b503466ee32 Mon Sep 17 00:00:00 2001 From: kroimon Date: Sun, 28 Sep 2008 11:53:30 +0000 Subject: [PATCH] Fixed the CALLMOD macro in Client.cpp Simple copy&paste error git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1221 726aef4b-f618-498e-8847-2d620e286838 --- Client.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Client.cpp b/Client.cpp index a1403ac5..9258cd87 100644 --- a/Client.cpp +++ b/Client.cpp @@ -14,10 +14,8 @@ #include "User.h" #include "znc.h" -#define CALLMOD(MOD, CLIENT, USER, FUNC) \ -do { \ +#define CALLMOD(MOD, CLIENT, USER, FUNC) { \ CModule* pModule = CZNC::Get().GetModules().FindModule(MOD); \ - \ if (pModule) { \ try { \ pModule->SetClient(CLIENT); \ @@ -31,7 +29,7 @@ do { \ } \ } \ } else { \ - pModule = USER->GetModules().FindModule(sModule); \ + pModule = (USER)->GetModules().FindModule(MOD); \ if (pModule) { \ try { \ pModule->SetClient(CLIENT); \ @@ -39,14 +37,14 @@ do { \ pModule->SetClient(NULL); \ } catch (CModule::EModException e) { \ if (e == CModule::UNLOAD) { \ - USER->GetModules().UnloadModule(MOD); \ + (USER)->GetModules().UnloadModule(MOD); \ } \ } \ } else { \ - PutStatus("No such module [" + sModule + "]"); \ + PutStatus("No such module [" + MOD + "]"); \ } \ } \ -} while (false) +} CClient::~CClient() { if (!m_spAuth.IsNull()) {