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

Use references instead of pointers for CModInfo

Browse Source 
This works fine and reduces the chances of memory leaks.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2011-06-11 18:16:00 +02:00
parent d683aea48d
commit ca97dca6dc
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules.h
+8 -10
View File
@@ -57,14 +57,12 @@ template<class M> CGlobalModule* TModLoadGlobal(ModHandle p,
extern "C" { \
double ZNCModVersion(); \
double ZNCModVersion() { return VERSION; } \
CModInfo* ZNCModInfo(); \
CModInfo* ZNCModInfo() { \
CModInfo* Info = new CModInfo(); \
Info->SetDescription(DESCRIPTION); \
Info->SetGlobal(GLOBAL); \
void ZNCModInfo(CModInfo& Info); \
void ZNCModInfo(CModInfo& Info) { \
Info.SetDescription(DESCRIPTION); \
Info.SetGlobal(GLOBAL); \
LOADER; \
TModInfo<CLASS>(*Info); \
return Info; \
TModInfo<CLASS>(Info); \
} \
}
@@ -96,7 +94,7 @@ template<class M> CGlobalModule* TModLoadGlobal(ModHandle p,
* @see For global modules you need GLOBALMODULEDEFS.
*/
#define MODULEDEFS(CLASS, DESCRIPTION) \
MODCOMMONDEFS(CLASS, DESCRIPTION, false, Info->SetLoader(TModLoad<CLASS>))
MODCOMMONDEFS(CLASS, DESCRIPTION, false, Info.SetLoader(TModLoad<CLASS>))
// !User Module Macros
// Global Module Macros
@@ -107,7 +105,7 @@ template<class M> CGlobalModule* TModLoadGlobal(ModHandle p,
/** This works exactly like MODULEDEFS, but for global modules. */
#define GLOBALMODULEDEFS(CLASS, DESCRIPTION) \
MODCOMMONDEFS(CLASS, DESCRIPTION, true, Info->SetGlobalLoader(TModLoadGlobal<CLASS>))
MODCOMMONDEFS(CLASS, DESCRIPTION, true, Info.SetGlobalLoader(TModLoadGlobal<CLASS>))
// !Global Module Macros
// Forward Declarations
@@ -982,7 +980,7 @@ public:
private:
static ModHandle OpenModule(const CString& sModule, const CString& sModPath,
bool &bVersionMismatch, CModInfo*& Info, CString& sRetMsg);
bool &bVersionMismatch, CModInfo& Info, CString& sRetMsg);
protected:
CUser* m_pUser;