adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-05 08:23:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wrap MODULECALL macros in a do-while

Browse Source 
This makes sure that there is a semicolon after his macro call and that this
macro works correctly in an if, e.g. if (foo) MODULECALL(foo);

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2011-09-10 14:00:58 +02:00
parent 924381f663
commit 893a631aa5
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.h
+12 -10
View File
@@ -62,8 +62,8 @@
} while (false)
#define USERMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER) \
assert(macUSER != NULL); \
if (macUSER) { \
do { \
assert(macUSER != NULL); \
CModules& UMods = macUSER->GetModules(); \
CIRCNetwork* pOldUNetwork = UMods.GetNetwork(); \
CClient* pOldUClient = UMods.GetClient(); \
@@ -76,12 +76,12 @@
} \
UMods.SetNetwork(pOldUNetwork); \
UMods.SetClient(pOldUClient); \
}
} while (false)
#define NETWORKMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER) \
assert(macUSER != NULL); \
assert(macNETWORK != NULL); \
if (macNETWORK) { \
do { \
assert(macUSER != NULL); \
assert(macNETWORK != NULL); \
CModules& NMods = ((CIRCNetwork*)macNETWORK)->GetModules(); \
CClient* pOldNClient = NMods.GetClient(); \
NMods.SetClient(macCLIENT); \
@@ -90,12 +90,14 @@
macEXITER; \
} \
NMods.SetClient(pOldNClient); \
}
} while (false)
#define MODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER) \
GLOBALMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER); \
USERMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER); \
NETWORKMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER);
do { \
GLOBALMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER); \
USERMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER); \
NETWORKMODULECALL(macFUNC, macUSER, macNETWORK, macCLIENT, macEXITER); \
} while (false)
/** @mainpage
* Welcome to the API documentation for ZNC.