From 87d062a5c5bb90e1fc2b5355dfbbc8577a62cb7a Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 24 Aug 2008 06:25:11 +0000
Subject: [PATCH] Unify some of the preprocessor macros in Modules.cpp

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
---
 Modules.cpp | 70 ++++++++++++-----------------------------------------
 1 file changed, 15 insertions(+), 55 deletions(-)

diff --git a/Modules.cpp b/Modules.cpp
index 4e949d89..173ea357 100644
--- a/Modules.cpp
+++ b/Modules.cpp
@@ -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);