diff options
| -rw-r--r-- | inc/abrt_types.h | 4 | ||||
| -rw-r--r-- | lib/MiddleWare/test.cpp | 2 | ||||
| -rw-r--r-- | src/Daemon/CommLayerServerDBus.cpp | 2 | ||||
| -rw-r--r-- | src/Daemon/MiddleWare.cpp | 48 | ||||
| -rw-r--r-- | src/Daemon/PluginManager.cpp | 6 | ||||
| -rw-r--r-- | src/Daemon/PluginManager.h | 2 | ||||
| -rw-r--r-- | src/Daemon/RPM.cpp | 5 | ||||
| -rw-r--r-- | src/Daemon/Settings.cpp | 51 |
8 files changed, 68 insertions, 52 deletions
diff --git a/inc/abrt_types.h b/inc/abrt_types.h index 76d03275..08f70906 100644 --- a/inc/abrt_types.h +++ b/inc/abrt_types.h @@ -28,10 +28,10 @@ typedef std::vector<std::string> vector_strings_t; typedef std::set<std::string> set_strings_t; typedef std::pair<std::string, std::string> pair_string_string_t; -typedef std::map<std::string, std::string> map_string_string_t; +typedef std::map<std::string, std::string> map_string_t; typedef std::vector<pair_string_string_t> vector_pair_string_string_t; -typedef std::vector<map_string_string_t> vector_map_string_string_t; +typedef std::vector<map_string_t> vector_map_string_t; typedef std::map<std::string, vector_pair_string_string_t> map_vector_pair_string_string_t; /* Report() method return type */ diff --git a/lib/MiddleWare/test.cpp b/lib/MiddleWare/test.cpp index 9e2498f5..fbad1db9 100644 --- a/lib/MiddleWare/test.cpp +++ b/lib/MiddleWare/test.cpp @@ -40,7 +40,7 @@ int main(int argc, char** argv) { CMiddleWare middleWare(PLUGINS_CONF_DIR, PLUGINS_LIB_DIR); - vector_map_string_string_t loaded_plugins; + vector_map_string_t loaded_plugins; middleWare.RegisterPlugin("CCpp"); middleWare.RegisterPlugin("Mailx"); middleWare.RegisterPlugin("Logger"); diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp index 0fe63942..1d3cdc25 100644 --- a/src/Daemon/CommLayerServerDBus.cpp +++ b/src/Daemon/CommLayerServerDBus.cpp @@ -538,7 +538,7 @@ static void handle_GetJobResult(DBusMessage* call, DBusMessage* reply) static void handle_GetPluginsInfo(DBusMessage* call, DBusMessage* reply) { - vector_map_string_string_t plugins_info = g_pPluginManager->GetPluginsInfo(); + vector_map_string_t plugins_info = g_pPluginManager->GetPluginsInfo(); DBusMessageIter iter; dbus_message_iter_init_append(reply, &iter); diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 448d3546..6400414b 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -332,23 +332,26 @@ report_status_t Report(const map_crash_report_t& pCrashReport, // analyzer with package name (CCpp:xrog-x11-app) has higher priority key = analyzer + ":" + packageName; - if (s_mapAnalyzerActionsAndReporters.find(key) == s_mapAnalyzerActionsAndReporters.end()) + map_analyzer_actions_and_reporters_t::iterator keyPtr = s_mapAnalyzerActionsAndReporters.find(key); + if (keyPtr == s_mapAnalyzerActionsAndReporters.end()) { // if there is no such settings, then try default analyzer - key = analyzer; + keyPtr = s_mapAnalyzerActionsAndReporters.find(analyzer); } - if (s_mapAnalyzerActionsAndReporters.find(key) != s_mapAnalyzerActionsAndReporters.end()) + + if (keyPtr != s_mapAnalyzerActionsAndReporters.end()) { - vector_pair_string_string_t::iterator it_r = s_mapAnalyzerActionsAndReporters[key].begin(); - for (; it_r != s_mapAnalyzerActionsAndReporters[key].end(); it_r++) + vector_pair_string_string_t::iterator it_r = keyPtr->second.begin(); + for (; it_r != keyPtr->second.end(); it_r++) { + std::string pluginName = it_r->first; try { std::string res; - if (g_pPluginManager->GetPluginType((*it_r).first) == REPORTER) + if (g_pPluginManager->GetPluginType(pluginName) == REPORTER) { - CReporter* reporter = g_pPluginManager->GetReporter((*it_r).first); + CReporter* reporter = g_pPluginManager->GetReporter(pluginName); std::string home = ""; map_plugin_settings_t oldSettings; map_plugin_settings_t newSettings; @@ -360,30 +363,30 @@ report_status_t Report(const map_crash_report_t& pCrashReport, { oldSettings = reporter->GetSettings(); - if (LoadPluginSettings(home + "/.abrt/" + (*it_r).first + "."PLUGINS_CONF_EXTENSION, newSettings)) + if (LoadPluginSettings(home + "/.abrt/" + pluginName + "."PLUGINS_CONF_EXTENSION, newSettings)) { reporter->SetSettings(newSettings); } } } - res = reporter->Report(pCrashReport, (*it_r).second); + res = reporter->Report(pCrashReport, it_r->second); if (home != "") { reporter->SetSettings(oldSettings); } } - ret[(*it_r).first].push_back("1"); - ret[(*it_r).first].push_back(res); + ret[pluginName].push_back("1"); + ret[pluginName].push_back(res); message += res + "\n"; } catch (CABRTException& e) { - ret[(*it_r).first].push_back("0"); - ret[(*it_r).first].push_back(e.what()); + ret[pluginName].push_back("0"); + ret[pluginName].push_back(e.what()); warn_client("Report(): " + e.what()); - update_client("Reporting via '"+(*it_r).first+"' was not successful: " + e.what()); + update_client("Reporting via '" + pluginName + "' was not successful: " + e.what()); } } } @@ -528,24 +531,25 @@ static mw_result_t SavePackageDescriptionToDebugDump(const std::string& pExecuta */ static void RunAnalyzerActions(const std::string& pAnalyzer, const std::string& pDebugDumpDir) { - if (s_mapAnalyzerActionsAndReporters.find(pAnalyzer) != s_mapAnalyzerActionsAndReporters.end()) + map_analyzer_actions_and_reporters_t::iterator analyzer = s_mapAnalyzerActionsAndReporters.find(pAnalyzer); + if (analyzer != s_mapAnalyzerActionsAndReporters.end()) { - vector_pair_string_string_t::iterator it_a = s_mapAnalyzerActionsAndReporters[pAnalyzer].begin(); - for (; it_a != s_mapAnalyzerActionsAndReporters[pAnalyzer].end(); it_a++) + vector_pair_string_string_t::iterator it_a = analyzer->second.begin(); + for (; it_a != analyzer->second.end(); it_a++) { + std::string pluginName = it_a->first; try { - if (g_pPluginManager->GetPluginType((*it_a).first) == ACTION) + if (g_pPluginManager->GetPluginType(pluginName) == ACTION) { - CAction* action = g_pPluginManager->GetAction((*it_a).first); - - action->Run(pDebugDumpDir, (*it_a).second); + CAction* action = g_pPluginManager->GetAction(pluginName); + action->Run(pDebugDumpDir, it_a->second); } } catch (CABRTException& e) { warn_client("RunAnalyzerActions(): " + e.what()); - update_client("Action performed by '"+(*it_a).first+"' was not successful: " + e.what()); + update_client("Action performed by '" + pluginName + "' was not successful: " + e.what()); } } } diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp index acabc93b..5371dd47 100644 --- a/src/Daemon/PluginManager.cpp +++ b/src/Daemon/PluginManager.cpp @@ -310,13 +310,13 @@ plugin_type_t CPluginManager::GetPluginType(const std::string& pName) return m_mapABRTPlugins[pName]->GetType(); } -vector_map_string_string_t CPluginManager::GetPluginsInfo() +vector_map_string_t CPluginManager::GetPluginsInfo() { - vector_map_string_string_t ret; + vector_map_string_t ret; map_abrt_plugins_t::iterator it_abrt_plugin = m_mapABRTPlugins.begin(); for (; it_abrt_plugin != m_mapABRTPlugins.end(); it_abrt_plugin++) { - map_string_string_t plugin_info; + map_string_t plugin_info; plugin_info["Enabled"] = (m_mapPlugins.find(it_abrt_plugin->second->GetName()) != m_mapPlugins.end()) ? "yes" : "no"; diff --git a/src/Daemon/PluginManager.h b/src/Daemon/PluginManager.h index 75a1bb27..06d5f035 100644 --- a/src/Daemon/PluginManager.h +++ b/src/Daemon/PluginManager.h @@ -126,7 +126,7 @@ class CPluginManager * Then a user can fill all needed informations like URLs etc. * @return A vector of maps <key, vaule> */ - vector_map_string_string_t GetPluginsInfo(); + vector_map_string_t GetPluginsInfo(); /** * A method, which sets up a plugin. The settings are also saved in home * directory of an user. diff --git a/src/Daemon/RPM.cpp b/src/Daemon/RPM.cpp index f5377bcb..87d25162 100644 --- a/src/Daemon/RPM.cpp +++ b/src/Daemon/RPM.cpp @@ -57,9 +57,10 @@ bool CRPM::CheckFingerprint(const std::string& pPackage) std::string PGPSignatureText = pgpsig; free(pgpsig); - if (PGPSignatureText.find(" Key ID ") != std::string::npos) + size_t Key_ID_pos = PGPSignatureText.find(" Key ID "); + if (Key_ID_pos != std::string::npos) { - std::string headerFingerprint = PGPSignatureText.substr(PGPSignatureText.find(" Key ID ") + sizeof (" Key ID ") - 1); + std::string headerFingerprint = PGPSignatureText.substr(Key_ID_pos + sizeof (" Key ID ") - 1); rpmtdFree(td); if (headerFingerprint != "") diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp index fd377e3b..7eb0b6af 100644 --- a/src/Daemon/Settings.cpp +++ b/src/Daemon/Settings.cpp @@ -97,33 +97,41 @@ static vector_pair_string_string_t ParseListWithArgs(const std::string& pValue) static void ParseCommon() { - if (s_mapSettingsCommon.find("OpenGPGCheck") != s_mapSettingsCommon.end()) + map_settings_t::const_iterator it = s_mapSettingsCommon.find("OpenGPGCheck"); + map_settings_t::const_iterator end = s_mapSettingsCommon.end(); + if (it != end) { - g_settings_bOpenGPGCheck = s_mapSettingsCommon["OpenGPGCheck"] == "yes"; + g_settings_bOpenGPGCheck = it->second == "yes"; } - if (s_mapSettingsCommon.find("OpenGPGPublicKeys") != s_mapSettingsCommon.end()) + it = s_mapSettingsCommon.find("OpenGPGPublicKeys"); + if (it != end) { - g_settings_setOpenGPGPublicKeys = ParseList(s_mapSettingsCommon["OpenGPGPublicKeys"]); + g_settings_setOpenGPGPublicKeys = ParseList(it->second); } - if (s_mapSettingsCommon.find("BlackList") != s_mapSettingsCommon.end()) + it = s_mapSettingsCommon.find("BlackList"); + if (it != end) { - g_settings_mapSettingsBlackList = ParseList(s_mapSettingsCommon["BlackList"]); + g_settings_mapSettingsBlackList = ParseList(it->second); } - if (s_mapSettingsCommon.find("Database") != s_mapSettingsCommon.end()) + it = s_mapSettingsCommon.find("Database"); + if (it != end) { - g_settings_sDatabase = s_mapSettingsCommon["Database"]; + g_settings_sDatabase = it->second; } - if (s_mapSettingsCommon.find("EnabledPlugins") != s_mapSettingsCommon.end()) + it = s_mapSettingsCommon.find("EnabledPlugins"); + if (it != end) { - g_settings_setEnabledPlugins = ParseList(s_mapSettingsCommon["EnabledPlugins"]); + g_settings_setEnabledPlugins = ParseList(it->second); } - if (s_mapSettingsCommon.find("MaxCrashReportsSize") != s_mapSettingsCommon.end()) + it = s_mapSettingsCommon.find("MaxCrashReportsSize"); + if (it != end) { - g_settings_nMaxCrashReportsSize = atoi(s_mapSettingsCommon["MaxCrashReportsSize"].c_str()); + g_settings_nMaxCrashReportsSize = atoi(it->second.c_str()); } - if (s_mapSettingsCommon.find("ActionsAndReporters") != s_mapSettingsCommon.end()) + it = s_mapSettingsCommon.find("ActionsAndReporters"); + if (it != end) { - g_settings_vectorActionsAndReporters = ParseListWithArgs(s_mapSettingsCommon["ActionsAndReporters"]); + g_settings_vectorActionsAndReporters = ParseListWithArgs(it->second); } } @@ -393,19 +401,22 @@ void SaveSettings(const char* pPath) void SetSettings(const map_abrt_settings_t& pSettings) { - if (pSettings.find(SECTION_COMMON) != pSettings.end()) + map_abrt_settings_t::const_iterator it = pSettings.find(SECTION_COMMON); + if (it != pSettings.end()) { - s_mapSettingsCommon = pSettings.find(SECTION_COMMON)->second; + s_mapSettingsCommon = it->second; ParseCommon(); } - if (pSettings.find(SECTION_ANALYZER_ACTIONS_AND_REPORTERS) != pSettings.end()) + it = pSettings.find(SECTION_ANALYZER_ACTIONS_AND_REPORTERS); + if (it != pSettings.end()) { - s_mapSettingsAnalyzerActionsAndReporters = pSettings.find(SECTION_ANALYZER_ACTIONS_AND_REPORTERS)->second; + s_mapSettingsAnalyzerActionsAndReporters = it->second; ParseAnalyzerActionsAndReporters(); } - if (pSettings.find(SECTION_CRON) != pSettings.end()) + it = pSettings.find(SECTION_CRON); + if (it != pSettings.end()) { - s_mapSettingsCron = pSettings.find(SECTION_CRON)->second; + s_mapSettingsCron = it->second; ParseCron(); } } |