diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/modules.cpp | 2 | ||||
| -rw-r--r-- | src/modules/database/database.cpp | 4 | ||||
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 6 | ||||
| -rw-r--r-- | src/modules/plugins/plugins.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/modules.cpp b/src/core/modules.cpp index 8dbbf54e63..977a50d4f8 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.cpp @@ -134,7 +134,7 @@ int LoadDefaultModules(void) if ( LoadContactsModule()) return 1;
if ( LoadContactListModule()) return 1;
if ( LoadAddContactModule()) return 1;
- if ( LoadNewPluginsModule()) return 1; // will call Load() on everything, clist will load first
+ if ( LoadNewPluginsModule()) return 1; // will call Load(void) on everything, clist will load first
LangPackDropUnusedItems();
diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp index c8743b3b30..94adf17742 100644 --- a/src/modules/database/database.cpp +++ b/src/modules/database/database.cpp @@ -428,7 +428,7 @@ static int FindDbPluginForProfile(const char*, DATABASELINK * dblink, LPARAM lPa int err = 0;
if (dblink->grokHeader(szProfile, &err) == 0) {
// added APIs?
- if ( !dblink->Load(szProfile, &pluginCoreLink)) {
+ if ( !dblink->Load(szProfile)) {
fillProfileName(tszProfile);
res = DBPE_DONE;
}
@@ -465,7 +465,7 @@ static int FindDbPluginAutoCreate(const char*, DATABASELINK * dblink, LPARAM lPa char *szProfile = makeFileName(tszProfile);
if (dblink->makeDatabase(szProfile, &err) == 0) {
dbCreated = true;
- if ( !dblink->Load(szProfile, &pluginCoreLink)) {
+ if ( !dblink->Load(szProfile)) {
fillProfileName(tszProfile);
res = DBPE_DONE;
}
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 391e76408d..dcef628238 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -296,7 +296,7 @@ void Plugin_Uninit(pluginEntry* p, bool bDynamic) if (p->pclass & PCLASS_DB)
p->bpi.dblink->Unload(p->pclass & PCLASS_OK);
- // if the basic API check had passed, call Unload if Load() was ever called
+ // if the basic API check had passed, call Unload if Load(void) was ever called
if (p->pclass & PCLASS_LOADED)
p->bpi.Unload();
@@ -660,7 +660,7 @@ int LoadNewPluginsModule(void) Plugin_Uninit(pluginList_freeimg);
} }
- // first load the clist cos alot of plugins need that to be present at Load()
+ // first load the clist cos alot of plugins need that to be present at Load(void)
for (useWhiteList = 1; useWhiteList >= 0 && clist == NULL; useWhiteList--)
clist=getCListModule(exe, slice, useWhiteList);
/* the loop above will try and get one clist DLL to work, if all fail then just bail now */
@@ -748,7 +748,7 @@ int LoadNewPluginsModuleInfos(void) // the database will select which db plugin to use, or fail if no profile is selected
if (LoadDatabaseModule()) return 1;
InitIni();
- // could validate the plugin entries here but internal modules arent loaded so can't call Load() in one pass
+ // could validate the plugin entries here but internal modules arent loaded so can't call Load(void) in one pass
return 0;
}
diff --git a/src/modules/plugins/plugins.h b/src/modules/plugins/plugins.h index fe6de60b8c..aa0251ab97 100644 --- a/src/modules/plugins/plugins.h +++ b/src/modules/plugins/plugins.h @@ -37,7 +37,7 @@ typedef struct { // can all be NULL #define PCLASS_DB 0x4 // has DatabasePluginInfo() and is valid as can be, and PCLASS_BASICAPI has to be set too
#define PCLASS_LAST 0x8 // this plugin should be unloaded after everything else
#define PCLASS_OK 0x10 // plugin should be loaded, if DB means nothing
-#define PCLASS_LOADED 0x20 // Load() has been called, Unload() should be called.
+#define PCLASS_LOADED 0x20 // Load(void) has been called, Unload() should be called.
#define PCLASS_STOPPED 0x40 // wasn't loaded cos plugin name not on white list
#define PCLASS_CLIST 0x80 // a CList implementation
#define PCLASS_SERVICE 0x100 // has Service Mode implementation
|