diff options
Diffstat (limited to 'src/libstrongswan')
| -rw-r--r-- | src/libstrongswan/plugins/plugin_loader.c | 9 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/plugin_loader.h | 11 | ||||
| -rw-r--r-- | src/libstrongswan/tests/test_runner.c | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 025e97adb..5ed0a9b0f 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -937,17 +937,14 @@ static bool find_plugin(char *path, char *name, char *buf, char **file) } METHOD(plugin_loader_t, load_plugins, bool, - private_plugin_loader_t *this, char *default_path, char *list) + private_plugin_loader_t *this, char *list) { enumerator_t *enumerator; - char *token; + char *default_path = NULL, *token; bool critical_failed = FALSE; #ifdef PLUGINDIR - if (default_path == NULL) - { - default_path = PLUGINDIR; - } + default_path = PLUGINDIR; #endif /* PLUGINDIR */ enumerator = enumerator_create_token(list, " ", " "); diff --git a/src/libstrongswan/plugins/plugin_loader.h b/src/libstrongswan/plugins/plugin_loader.h index 15496f4c7..285b33910 100644 --- a/src/libstrongswan/plugins/plugin_loader.h +++ b/src/libstrongswan/plugins/plugin_loader.h @@ -57,25 +57,24 @@ struct plugin_loader_t { bool critical); /** - * Load a list of plugins from a directory. + * Load a list of plugins. * - * Each plugin in list may have a ending exclamation mark (!) to mark it + * Each plugin in list may have an ending exclamation mark (!) to mark it * as a critical plugin. If loading a critical plugin fails, plugin loading * is aborted and FALSE is returned. * * Additional paths can be added with add_path(), these will be searched - * for the plugins first, in the order they were added, then the given path - * or the default follow. + * for the plugins first, in the order they were added, then the default + * path follows. * * @note Even though this method could be called multiple times this is * currently not really supported in regards to plugin features and their * dependencies (in particular soft dependencies). * - * @param path path containing loadable plugins, NULL for default * @param list space separated list of plugins to load * @return TRUE if all critical plugins loaded successfully */ - bool (*load)(plugin_loader_t *this, char *path, char *list); + bool (*load)(plugin_loader_t *this, char *list); /** * Add an additional search path for plugins. diff --git a/src/libstrongswan/tests/test_runner.c b/src/libstrongswan/tests/test_runner.c index 85c6b2019..2f9e4dc0a 100644 --- a/src/libstrongswan/tests/test_runner.c +++ b/src/libstrongswan/tests/test_runner.c @@ -40,7 +40,7 @@ static bool load_plugins() } enumerator->destroy(enumerator); - return lib->plugins->load(lib->plugins, NULL, PLUGINS); + return lib->plugins->load(lib->plugins, PLUGINS); } int main() |