diff options
| author | Karel Klic <kklic@redhat.com> | 2009-11-20 12:22:36 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2009-11-20 12:22:36 +0100 |
| commit | 18363807e6ffa8dab5a76f40bacac3695985147a (patch) | |
| tree | 8195336c29136a4761db501160c9f4620b16aa70 /src/Daemon/PluginManager.cpp | |
| parent | bd60681c8227bc31ef0991e98a9a3e849032c924 (diff) | |
| parent | 6ec2390e40ba4b0f6e10a2c8ce858d3431b34964 (diff) | |
| download | abrt-18363807e6ffa8dab5a76f40bacac3695985147a.tar.gz abrt-18363807e6ffa8dab5a76f40bacac3695985147a.tar.xz abrt-18363807e6ffa8dab5a76f40bacac3695985147a.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src/Daemon/PluginManager.cpp')
| -rw-r--r-- | src/Daemon/PluginManager.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp index 3867ec9..2f4d875 100644 --- a/src/Daemon/PluginManager.cpp +++ b/src/Daemon/PluginManager.cpp @@ -58,9 +58,9 @@ bool LoadPluginSettings(const char *pPath, map_plugin_settings_t& pSettings) std::string value; for (ii = 0; ii < line.length(); ii++) { - if (line[ii] == '\"') + if (line[ii] == '"') { - in_quote = in_quote == true ? false : true; + in_quote = !in_quote; } if (isspace(line[ii]) && !in_quote) { @@ -166,9 +166,10 @@ void CPluginManager::LoadPlugin(const char *pName) { std::string libPath = ssprintf(PLUGINS_LIB_DIR"/"PLUGINS_LIB_PREFIX"%s."PLUGINS_LIB_EXTENSION, pName); abrtPlugin = new CABRTPlugin(libPath.c_str()); - if (abrtPlugin->GetMagicNumber() != PLUGINS_MAGIC_NUMBER || - (abrtPlugin->GetType() < ANALYZER && abrtPlugin->GetType() > DATABASE)) - { + if (abrtPlugin->GetMagicNumber() != PLUGINS_MAGIC_NUMBER + || abrtPlugin->GetType() < 0 + || abrtPlugin->GetType() > MAX_PLUGIN_TYPE + ) { throw CABRTException(EXCEP_PLUGIN, "CPluginManager::LoadPlugin(): non-compatible plugin"); } log("Plugin %s (%s) succesfully loaded", pName, abrtPlugin->GetVersion()); |