diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-03 15:55:59 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-03 15:55:59 +0100 |
| commit | 63c4d3bf043b3b52e38dbdc5dfafbe60cd82212b (patch) | |
| tree | 75e2062580e88ee0a8aaf585be93ee21a942a123 /src | |
| parent | 6f22376579e925234181036c3e52832fc5dcf842 (diff) | |
| parent | 412ebc00ca3ccbbb6a60094a67d1402376298c85 (diff) | |
Merge branch 'master' into rhel6
Diffstat (limited to 'src')
| -rw-r--r-- | src/Daemon/PluginManager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp index c552880..273cceb 100644 --- a/src/Daemon/PluginManager.cpp +++ b/src/Daemon/PluginManager.cpp @@ -159,16 +159,15 @@ void CPluginManager::UnLoadPlugins() CPlugin* CPluginManager::LoadPlugin(const char *pName, bool enabled_only) { - map_string_t plugin_info; - - plugin_info["Name"] = pName; - map_plugin_t::iterator it_plugin = m_mapPlugins.find(pName); if (it_plugin != m_mapPlugins.end()) { return it_plugin->second; /* ok */ } + map_string_t plugin_info; + plugin_info["Name"] = pName; + const char *conf_name = pName; if (strncmp(pName, "Kerneloops", sizeof("Kerneloops")-1) == 0) { |