iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify some of the preprocessor macros in Modules.cpp

Browse Source 
The only difference between MODUNLOADCHK and GLOBALMODCALL and between
MODHALTCHK and GLOBALMODHALTCHK was that the one used CModule while the other
one used CGlobalModule.

Create two new macros that expects the class name as an extra parameter and
make all those other macros just call these two.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1166 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-08-24 06:25:11 +00:00
parent 074adc94c1
commit 87d062a5c5
1 changed files with 15 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Modules.cpp
View File

@@ -18,75 +18,32 @@
# warning "your crap box doesnt define RTLD_LOCAL !?"
#endif
#define MODUNLOADCHK(func) \
#define _MODUNLOADCHK(func, type) \
for (unsigned int a = 0; a < size(); a++) { \
try { \
CModule* pMod = (*this)[a]; \
if (m_pUser) { \
type* pMod = (type *) (*this)[a]; \
if (m_pUser) { \
pMod->SetUser(m_pUser); \
pMod->func; \
pMod->func; \
pMod->SetUser(NULL); \
} else { \
pMod->func; \
} \
} else { \
pMod->func; \
} \
} catch (CModule::EModException e) { \
if (e == CModule::UNLOAD) { \
UnloadModule((*this)[a]->GetModName()); \
} \
} \
} \
}
#define GLOBALMODCALL(func) \
for (unsigned int a = 0; a < size(); a++) { \
try { \
CGlobalModule* pMod = (CGlobalModule*) (*this)[a]; \
if (m_pUser) { \
pMod->SetUser(m_pUser); \
pMod->func; \
pMod->SetUser(NULL); \
} else { \
pMod->func; \
} \
} catch (CModule::EModException e) { \
if (e == CModule::UNLOAD) { \
UnloadModule((*this)[a]->GetModName()); \
} \
} \
} \
#define MODUNLOADCHK(func) _MODUNLOADCHK(func, CModule)
#define GLOBALMODCALL(func) _MODUNLOADCHK(func, CGlobalModule)
#define GLOBALMODHALTCHK(func) \
#define _MODHALTCHK(func, type) \
bool bHaltCore = false; \
for (unsigned int a = 0; a < size(); a++) { \
try { \
CGlobalModule* pMod = (CGlobalModule*) (*this)[a]; \
CModule::EModRet e = CModule::CONTINUE; \
if (m_pUser) { \
pMod->SetUser(m_pUser); \
e = pMod->func; \
pMod->SetUser(NULL); \
} else { \
e = pMod->func; \
} \
if (e == CModule::HALTMODS) { \
break; \
} else if (e == CModule::HALTCORE) { \
bHaltCore = true; \
} else if (e == CModule::HALT) { \
bHaltCore = true; \
break; \
} \
} catch (CModule::EModException e) { \
if (e == CModule::UNLOAD) { \
UnloadModule((*this)[a]->GetModName()); \
} \
} \
} \
return bHaltCore;
#define MODHALTCHK(func) \
bool bHaltCore = false; \
for (unsigned int a = 0; a < size(); a++) { \
try { \
CModule* pMod = (*this)[a]; \
type* pMod = (type*) (*this)[a]; \
CModule::EModRet e = CModule::CONTINUE; \
if (m_pUser) { \
pMod->SetUser(m_pUser); \
@@ -111,6 +68,9 @@
} \
return bHaltCore;
#define MODHALTCHK(func) _MODHALTCHK(func, CModule)
#define GLOBALMODHALTCHK(func) _MODHALTCHK(func, CGlobalModule)
/////////////////// Timer ///////////////////
CTimer::CTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription) : CCron() {
SetName(sLabel);