diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-24 05:30:42 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-24 05:30:42 +0200 |
| commit | 0fdbc8ae884312b04309b4931d8bdf9b082de82c (patch) | |
| tree | e9e469bfcb468a5336c13de462488c3c40664451 /src/Daemon/PluginManager.cpp | |
| parent | 959a0b1b38e45cf8c00a862be01a0bb05e599123 (diff) | |
| download | abrt-0fdbc8ae884312b04309b4931d8bdf9b082de82c.tar.gz abrt-0fdbc8ae884312b04309b4931d8bdf9b082de82c.tar.xz abrt-0fdbc8ae884312b04309b4931d8bdf9b082de82c.zip | |
hardcode CPluginManager constructor's parameters, they are constant
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'src/Daemon/PluginManager.cpp')
| -rw-r--r-- | src/Daemon/PluginManager.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp index d63d9769..de3ca9a1 100644 --- a/src/Daemon/PluginManager.cpp +++ b/src/Daemon/PluginManager.cpp @@ -41,12 +41,7 @@ static const char* const plugin_type_str_t[] = { }; -CPluginManager::CPluginManager( - const std::string& pPluginsConfDir, - const std::string& pPluginsLibDir) -: - m_sPluginsConfDir(pPluginsConfDir), - m_sPluginsLibDir(pPluginsLibDir) +CPluginManager::CPluginManager() {} CPluginManager::~CPluginManager() @@ -54,10 +49,10 @@ CPluginManager::~CPluginManager() void CPluginManager::LoadPlugins() { - DIR *dir = opendir(m_sPluginsLibDir.c_str()); - struct dirent *dent = NULL; + DIR *dir = opendir(PLUGINS_LIB_DIR); if (dir != NULL) { + struct dirent *dent; while ((dent = readdir(dir)) != NULL) { // FIXME: need to handle DT_UNKNOWN too @@ -94,7 +89,7 @@ void CPluginManager::LoadPlugin(const std::string& pName) CABRTPlugin* abrtPlugin = NULL; try { - std::string libPath = m_sPluginsLibDir + "/" + PLUGINS_LIB_PREFIX + pName + "." + PLUGINS_LIB_EXTENSION; + std::string libPath = PLUGINS_LIB_DIR"/"PLUGINS_LIB_PREFIX + pName + "."PLUGINS_LIB_EXTENSION; abrtPlugin = new CABRTPlugin(libPath.c_str()); if (abrtPlugin->GetMagicNumber() != PLUGINS_MAGIC_NUMBER || (abrtPlugin->GetType() < ANALYZER && abrtPlugin->GetType() > DATABASE)) @@ -136,7 +131,7 @@ void CPluginManager::RegisterPlugin(const std::string& pName) CPlugin* plugin = m_mapABRTPlugins[pName]->PluginNew(); map_plugin_settings_t pluginSettings; - LoadPluginSettings(m_sPluginsConfDir + "/" + pName + "." + PLUGINS_CONF_EXTENSION, pluginSettings); + LoadPluginSettings(PLUGINS_CONF_DIR"/" + pName + "."PLUGINS_CONF_EXTENSION, pluginSettings); try { plugin->Init(); |