From 5eec2e7d6d1986a8e4d16c2c96414e26180f1c64 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 17 Sep 2015 13:45:57 -0700 Subject: [PATCH] Remove error message outparam to LoadExtensions. --- core/logic/PluginSys.cpp | 10 ++++------ core/logic/PluginSys.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/logic/PluginSys.cpp b/core/logic/PluginSys.cpp index d73d0cabc..63afba2d8 100644 --- a/core/logic/PluginSys.cpp +++ b/core/logic/PluginSys.cpp @@ -927,8 +927,7 @@ LoadRes CPluginManager::LoadPlugin(CPlugin **aResult, const char *path, bool deb switch (result) { case APLRes_Success: - if (!LoadExtensions(plugin, error, maxlength)) - return LoadRes_Failure; + LoadExtensions(plugin); return LoadRes_Successful; case APLRes_Failure: @@ -1158,10 +1157,9 @@ bool CPlugin::ForEachExtVar(const ExtVarCallback& callback) return true; } -bool CPluginManager::LoadExtensions(CPlugin *pPlugin, char *error, size_t maxlength) +void CPluginManager::LoadExtensions(CPlugin *pPlugin) { - auto callback = [pPlugin, error, maxlength] - (const sp_pubvar_t *pubvar, const CPlugin::ExtVar& ext) -> bool + auto callback = [pPlugin] (const sp_pubvar_t *pubvar, const CPlugin::ExtVar& ext) -> bool { char path[PLATFORM_MAX_PATH]; /* Attempt to auto-load if necessary */ @@ -1171,7 +1169,7 @@ bool CPluginManager::LoadExtensions(CPlugin *pPlugin, char *error, size_t maxlen } return true; }; - return pPlugin->ForEachExtVar(ke::Move(callback)); + pPlugin->ForEachExtVar(ke::Move(callback)); } bool CPluginManager::RequireExtensions(CPlugin *pPlugin, char *error, size_t maxlength) diff --git a/core/logic/PluginSys.h b/core/logic/PluginSys.h index f4d06a817..b729eaebf 100644 --- a/core/logic/PluginSys.h +++ b/core/logic/PluginSys.h @@ -485,7 +485,7 @@ private: /** * Runs an extension pass on a plugin. */ - bool LoadExtensions(CPlugin *pPlugin, char *error, size_t maxlength); + void LoadExtensions(CPlugin *pPlugin); bool RequireExtensions(CPlugin *pPlugin, char *error, size_t maxlength); /**