From 26fa234e0570a3194888cd5493668e15f91e8e7b Mon Sep 17 00:00:00 2001 From: psychon Date: Mon, 16 Feb 2009 17:36:52 +0000 Subject: [PATCH] Remove some completely unused code in Modules.cpp Modules.cpp is capsuled in a huge #ifdef _MODULES block (see r767), but some code in there still uses #ifndef _MODULES, which is never going to be used. Thanks to Sebastinas for finding this. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1381 726aef4b-f618-498e-8847-2d620e286838 --- Modules.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Modules.cpp b/Modules.cpp index 18e29b7b..1dddbbf9 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -688,10 +688,6 @@ CModule* CModules::FindModule(const CString& sModule) const { } bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg, bool bFake) { -#ifndef _MODULES - sRetMsg = "Unable to load module [" + sModule + "] module support was not enabled."; - return false; -#else sRetMsg = ""; for (unsigned int a = 0; a < sModule.length(); a++) { @@ -831,7 +827,6 @@ bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CUser* p sRetMsg = "Loaded module [" + sModule + "] [" + sModPath + "]"; } return true; -#endif // !_MODULES } bool CModules::UnloadModule(const CString& sModule) { @@ -841,10 +836,6 @@ bool CModules::UnloadModule(const CString& sModule) { bool CModules::UnloadModule(const CString& sModule, CString& sRetMsg) { CString sMod = sModule; // Make a copy incase the reference passed in is from CModule::GetModName() -#ifndef _MODULES - sRetMsg = "Unable to unload module [" + sMod + "] module support was not enabled."; - return false; -#else CModule* pModule = FindModule(sMod); sRetMsg = ""; @@ -894,7 +885,6 @@ bool CModules::UnloadModule(const CString& sModule, CString& sRetMsg) { sRetMsg = "Unable to unload module [" + sMod + "]"; return false; -#endif // !_MODULES } bool CModules::ReloadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg) {